[med-svn] r13051 - in trunk/packages/vcftools/trunk/debian: . patches

[Dominique Belhachemi]

Author: domibel
Date: 2013-02-19 21:20:09 +0000 (Tue, 19 Feb 2013)
New Revision: 13051

Removed:
   trunk/packages/vcftools/trunk/debian/patches/perl.patch
Modified:
   trunk/packages/vcftools/trunk/debian/changelog
   trunk/packages/vcftools/trunk/debian/patches/series
   trunk/packages/vcftools/trunk/debian/patches/use-dpkg-buildflags.patch
Log:
new upstream version 0.1.10

Modified: trunk/packages/vcftools/trunk/debian/changelog
===================================================================
--- trunk/packages/vcftools/trunk/debian/changelog	2013-02-19 15:52:48 UTC (rev 13050)
+++ trunk/packages/vcftools/trunk/debian/changelog	2013-02-19 21:20:09 UTC (rev 13051)
@@ -1,3 +1,11 @@
+vcftools (0.1.10+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream version
+  * Updated debian/use-dpkg-buildflags.patch
+  * Removed debian/perl.patch (applied upstream)
+
+ -- Dominique Belhachemi <domibel at debian.org>  Tue, 19 Feb 2013 14:18:25 -0500
+
 vcftools (0.1.9+dfsg-2) unstable; urgency=low
 
   * debian/control: description changed (Closes: #689058)

Deleted: trunk/packages/vcftools/trunk/debian/patches/perl.patch
===================================================================
--- trunk/packages/vcftools/trunk/debian/patches/perl.patch	2013-02-19 15:52:48 UTC (rev 13050)
+++ trunk/packages/vcftools/trunk/debian/patches/perl.patch	2013-02-19 21:20:09 UTC (rev 13051)
@@ -1,15 +0,0 @@
-Description: Don't use qw(...) as parentheses anymore (bad syntax now)
-Author: Thorsten Alteholz <debian at alteholz.de>
-Index: vcftools_0.1.9/perl/Vcf.pm
-===================================================================
---- vcftools_0.1.9.orig/perl/Vcf.pm	2012-05-10 07:53:15.000000000 +0200
-+++ vcftools_0.1.9/perl/Vcf.pm	2012-12-02 18:55:40.000000000 +0100
-@@ -1619,7 +1619,7 @@
-     }
-     if ( defined $out ) 
-     {
--        for my $key qw(fmtA fmtG infoA infoG) { if ( !exists($$out{$key}) ) { $$out{$key}=[] } }
-+        for my $key (qw(fmtA fmtG infoA infoG)) { if ( !exists($$out{$key}) ) { $$out{$key}=[] } }
-     }
-     return $out;
- }

Modified: trunk/packages/vcftools/trunk/debian/patches/series
===================================================================
--- trunk/packages/vcftools/trunk/debian/patches/series	2013-02-19 15:52:48 UTC (rev 13050)
+++ trunk/packages/vcftools/trunk/debian/patches/series	2013-02-19 21:20:09 UTC (rev 13051)
@@ -1,3 +1,2 @@
 make.patch
 use-dpkg-buildflags.patch
-perl.patch

Modified: trunk/packages/vcftools/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/vcftools/trunk/debian/patches/use-dpkg-buildflags.patch	2013-02-19 15:52:48 UTC (rev 13050)
+++ trunk/packages/vcftools/trunk/debian/patches/use-dpkg-buildflags.patch	2013-02-19 21:20:09 UTC (rev 13051)
@@ -2,23 +2,25 @@
 Date: Sat, 12 May 2012 09:31:58 +0200
 Description: Enable propagation of hardening flags
 
---- vcftools_0.1.9.orig/cpp/Makefile
-+++ vcftools_0.1.9/cpp/Makefile
-@@ -11,7 +11,7 @@
+--- vcftools-0.1.10+dfsg.orig/cpp/Makefile
++++ vcftools-0.1.10+dfsg/cpp/Makefile
+@@ -11,7 +11,7 @@ ifndef VCFTOOLS_PCA
  	VCFTOOLS_PCA = 0
  endif
  # Compiler flags
--CPPFLAGS = -O2 -Wall -Wextra
-+CPPFLAGS += -O2 -Wall -Wextra
+-CPPFLAGS = -O2 -Wall -Wextra -D_FILE_OFFSET_BITS=64
++CPPFLAGS += -O2 -Wall -Wextra -D_FILE_OFFSET_BITS=64
  #CPPFLAGS = -g 
  # Included libraries (zlib)
  LIB = -lz 
-@@ -36,7 +36,7 @@
- all: vcftools
+@@ -44,8 +44,8 @@ endif
+ -include $(OBJS:.o=.d)
  
- vcftools: $(SOURCES)
--	$(CPP) $(CPPFLAGS) $(SOURCES) -o $@ $(LIB)
-+	$(CPP) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(SOURCES) -o $@ $(LIB)
- ifdef BINDIR
- 	cp $(CURDIR)/$@ $(BINDIR)/$@
- endif
+ %.o: %.cpp
+-	$(CPP) -c $(CPPFLAGS) $*.cpp -o $*.o
+-	$(CPP) -MM $(CPPFLAGS) $*.cpp > $*.d
++	$(CPP) -c $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $*.cpp -o $*.o
++	$(CPP) -MM $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $*.cpp > $*.d
+ 
+ # remove compilation products
+ clean: