From e814cb5f411b3fd863406f4121ccd0a1e4462228 Mon Sep 17 00:00:00 2001 From: Andreas Tille Date: Wed, 25 Apr 2012 17:03:46 +0200 Subject: [PATCH] Add myself to uploaders; patch to handle set but unused variable --- debian/changelog | 8 +++++++- debian/control | 3 ++- debian/patches/count-set-but-not-used.patch | 22 +++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 debian/patches/count-set-but-not-used.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 20663ca..db269e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ tabix (0.2.5-2) UNRELEASED; urgency=low + [ Charles Plessy ] 7a09003 Added metadata about Upstream in debian/upstream. 1a85d96 Refreshed Debian copyright file 9c70833 Include 7 digits of the commit ID in the changelog entry. - -- Charles Plessy Fri, 09 Mar 2012 14:08:26 +0900 + [ Andreas Tille ] + * debian/patches/count-set-but-not-used.patch: uncomment unused + variable + Closes: #626267 + + -- Andreas Tille Wed, 25 Apr 2012 17:02:10 +0200 tabix (0.2.5-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 9692efd..aa00454 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,8 @@ Section: science Priority: optional Maintainer: Debian Med Packaging Team DM-Upload-Allowed: yes -Uploaders: Charles Plessy +Uploaders: Charles Plessy , + Andreas Tille Build-Depends: cdbs, debhelper (>= 8), zlib1g-dev Standards-Version: 3.9.2 Homepage: http://samtools.sourceforge.net/tabix.shtml diff --git a/debian/patches/count-set-but-not-used.patch b/debian/patches/count-set-but-not-used.patch new file mode 100644 index 0000000..6204a1d --- /dev/null +++ b/debian/patches/count-set-but-not-used.patch @@ -0,0 +1,22 @@ +Author: Andreas Tille +Date: Wed, 25 Apr 2012 17:01:06 +0200 +Bug-Closed: http://bugs.debian.org/626267 +Description: Do not set unused variables + +--- tabix.orig/bgzf.c ++++ tabix/bgzf.c +@@ -627,11 +627,11 @@ + if (fp->open_mode == 'w') { + if (bgzf_flush(fp) != 0) return -1; + { // add an empty block +- int count, block_length = deflate_block(fp, 0); ++ int /* count, */ block_length = deflate_block(fp, 0); + #ifdef _USE_KNETFILE +- count = fwrite(fp->compressed_block, 1, block_length, fp->x.fpw); ++ /* count = */ fwrite(fp->compressed_block, 1, block_length, fp->x.fpw); + #else +- count = fwrite(fp->compressed_block, 1, block_length, fp->file); ++ /* count = */ fwrite(fp->compressed_block, 1, block_length, fp->file); + #endif + } + #ifdef _USE_KNETFILE diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f51f525 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +count-set-but-not-used.patch -- 2.30.2