[med-svn] r19908 - trunk/packages/vcftools/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2015-08-09 06:23:37 +0000 (Sun, 09 Aug 2015)
New Revision: 19908

Modified:
   trunk/packages/vcftools/trunk/debian/patches/make.patch
   trunk/packages/vcftools/trunk/debian/patches/use-dpkg-buildflags.patch
Log:
Adapt patches


Modified: trunk/packages/vcftools/trunk/debian/patches/make.patch
===================================================================
--- trunk/packages/vcftools/trunk/debian/patches/make.patch	2015-08-09 06:19:59 UTC (rev 19907)
+++ trunk/packages/vcftools/trunk/debian/patches/make.patch	2015-08-09 06:23:37 UTC (rev 19908)
@@ -1,19 +1,16 @@
 Description: do not use MAKEFLAGS and not MANDIR
 Author: Thorsten Alteholz <debian at alteholz.de>
 Last-Update: 2014-04-03
-Index: vcftools_0.1.12/Makefile
-===================================================================
---- vcftools_0.1.12.orig/Makefile	2014-04-04 10:37:59.000000000 +0200
-+++ vcftools_0.1.12/Makefile	2014-04-04 10:38:34.000000000 +0200
-@@ -25,9 +25,8 @@
+
+--- a/Makefile
++++ b/Makefile
+@@ -25,8 +25,7 @@ export MODDIR = ${PREFIX}/lib/perl5/site
  
  DIRS = cpp perl
  install:
 -	    @mkdir -p $(BINDIR); mkdir -p $(MODDIR); mkdir -p $(MANDIR); \
--	    cp ${PREFIX}/cpp/vcftools.1.gz $(MANDIR); \
--        for dir in $(DIRS); do cd $$dir && $(MAKE) $(MAKEFLAGS) && cd ..; done
+-	    cp ${SRCDIR}/cpp/vcftools.1 $(MANDIR); \
 +	    @mkdir -p $(BINDIR); mkdir -p $(MODDIR); \
-+        for dir in $(DIRS); do cd $$dir && $(MAKE) && cd ..; done
+         for dir in $(DIRS); do cd $$dir && $(MAKE) $(MAKEFLAGS) && cd ..; done
  
  clean:
- 		@for dir in $(DIRS); do cd $$dir && $(MAKE) clean && cd ..; done

Modified: trunk/packages/vcftools/trunk/debian/patches/use-dpkg-buildflags.patch
===================================================================
--- trunk/packages/vcftools/trunk/debian/patches/use-dpkg-buildflags.patch	2015-08-09 06:19:59 UTC (rev 19907)
+++ trunk/packages/vcftools/trunk/debian/patches/use-dpkg-buildflags.patch	2015-08-09 06:23:37 UTC (rev 19908)
@@ -2,11 +2,9 @@
 Date: Sat, 12 May 2012 09:31:58 +0200
 Description: Enable propagation of hardening flags
 
-Index: vcftools_0.1.11/cpp/Makefile
-===================================================================
---- vcftools_0.1.11.orig/cpp/Makefile	2013-06-13 16:40:54.000000000 +0200
-+++ vcftools_0.1.11/cpp/Makefile	2013-06-27 19:54:45.000000000 +0200
-@@ -12,9 +12,9 @@
+--- a/cpp/Makefile
++++ b/cpp/Makefile
+@@ -12,9 +12,9 @@ ifndef VCFTOOLS_PCA
  	VCFTOOLS_PCA = 0
  endif
  # Compiler flags
@@ -18,7 +16,7 @@
  #CPPFLAGS = -O2 -Wall -pg -D_FILE_OFFSET_BITS=64
  # Included libraries (zlib)
  LIB = -lz 
-@@ -38,7 +38,7 @@
+@@ -35,7 +35,7 @@ ifeq ($(VCFTOOLS_PCA), 1)
  endif
  
  vcftools: $(OBJS)
@@ -27,7 +25,7 @@
  ifdef BINDIR
  	cp $(CURDIR)/$@ $(BINDIR)/$@
  endif
-@@ -50,8 +50,8 @@
+@@ -47,8 +47,8 @@ bgzf: bgzf.c
  -include $(OBJS:.o=.d)
  
  %.o: %.cpp