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

[Andreas Tille]

The following commit has been merged in the master branch:
commit 84d11c8582a9911643014aa9c68d538e3c064997
Author: Andreas Tille <tille at debian.org>
Date:   Sat May 12 08:52:57 2012 +0200

    ld-as-needed.patch needs to be adapted

diff --git a/debian/changelog b/debian/changelog
index f788d41..477861c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
 tabix (0.2.5-3) UNRELEASED; urgency=low
 
-  * debian/patches/ld-as-needed.patch:  Enable building with --as-needed
-    (Thanks to David Shorten <dpshorten at gmail.com> for the patch)
-    Closes: #632150
   * debian/patches/use-dpkg-buildflags.patch: Really enable hardening
     build flags (Thanks for the patch to Simon Ruderich <simon at ruderich.org>)
     Closes: #670759
+  * debian/patches/ld-as-needed.patch:  Enable building with --as-needed
+    (Thanks to David Shorten <dpshorten at gmail.com> for the patch)
+    Closes: #632150
 
  -- Andreas Tille <tille at debian.org>  Fri, 11 May 2012 13:32:56 +0200
 
diff --git a/debian/patches/ld-as-needed.patch b/debian/patches/ld-as-needed.patch
index 89fa1ed..bc0e2c8 100644
--- a/debian/patches/ld-as-needed.patch
+++ b/debian/patches/ld-as-needed.patch
@@ -5,12 +5,12 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632150
 Last-Update: 2011-06-30
 --- tabix.orig/Makefile
 +++ tabix/Makefile
-@@ -38,7 +38,7 @@
+@@ -41,7 +41,7 @@
  		$(AR) -cru $@ $(LOBJS)
  
  tabix:lib $(AOBJS)
--		$(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lz -L. -ltabix
-+		$(CC) $(CFLAGS) -o $@ $(AOBJS) -L. -ltabix -lm $(LIBPATH) -lz  
+-		$(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) -o $@ bgzip.o bgzf.o knetfile.o -lz
+ 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ bgzip.o bgzf.o knetfile.o -lz

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