Add myself to uploaders; patch to handle set but unused variable

diff --git a/debian/changelog b/debian/changelog
index 20663ca7ca0481d3e40812718860389f66c9afbb..db269e1f327eb3dda0e3b2ac03de420b14f32dca 100644 (file)
--- 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 <plessy@debian.org>  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 <tille@debian.org>  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 9692efdbb26b08595b3b575174c4416ea0d73754..aa004543d8c07c05d4d5b19bb3d4af2e26fe5587 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: science
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 DM-Upload-Allowed: yes
-Uploaders: Charles Plessy <plessy@debian.org>
+Uploaders: Charles Plessy <plessy@debian.org>,
+ Andreas Tille <tille@debian.org>
 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 (file)
index 0000000..6204a1d
--- /dev/null
+++ b/debian/patches/count-set-but-not-used.patch
@@ -0,0 +1,22 @@
+Author: Andreas Tille <tille@debian.org>
+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 (file)
index 0000000..f51f525
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+count-set-but-not-used.patch