[med-svn] [SCM] tabix branch, master, updated. debian/0.2.5-1-24-g185665e

[Charles Plessy]

The following commit has been merged in the master branch:
commit 9de2ad508fd9055fdd6b2a8b7e9269096a8c0e45
Author: Charles Plessy <plessy at debian.org>
Date:   Fri Jun 22 12:56:51 2012 +0900

    Removed patches applied or obsoleted upstream.

diff --git a/debian/patches/count-set-but-not-used.patch b/debian/patches/count-set-but-not-used.patch
deleted file mode 100644
index 6204a1d..0000000
--- a/debian/patches/count-set-but-not-used.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Andreas Tille <tille at 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/ld-as-needed.patch b/debian/patches/ld-as-needed.patch
deleted file mode 100644
index bc0e2c8..0000000
--- a/debian/patches/ld-as-needed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Reorder libraries to build with ld --as-needed
-Author: David Shorten <dpshorten at gmail.com>
-Bug-Ubuntu: http://bugs.launchpad.net/ubuntu/+source/tabix/+bug/803202
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632150
-Last-Update: 2011-06-30
---- tabix.orig/Makefile
-+++ tabix/Makefile
-@@ -41,7 +41,7 @@
- 		$(AR) -cru $@ $(LOBJS)
- 
- tabix:lib $(AOBJS)
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lz -L. -ltabix
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(AOBJS) -L. -ltabix -lm $(LIBPATH) -lz
- 
- bgzip:bgzip.o bgzf.o knetfile.o
- 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ bgzip.o bgzf.o knetfile.o -lz
diff --git a/debian/patches/series b/debian/patches/series
index 32e9be1..a7b179a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-count-set-but-not-used.patch
 use-dpkg-buildflags.patch
-ld-as-needed.patch

-- 
Generic indexer for TAB-delimited genome position files.