[med-svn] [plink1.9] 04/04: Refresh patches

[Dylan Aïssi]

This is an automated email from the git hooks/post-receive script.

bob.dybian-guest pushed a commit to branch master
in repository plink1.9.

commit 2ff0e3cf94c30ab830927b8761f18d18337f1cd4
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Thu Feb 5 09:10:25 2015 +0100

    Refresh patches
---
 debian/patches/01_Fix_use_internal_lib.patch         |  6 +++---
 debian/patches/02_Activate_Hardening.patch           | 20 --------------------
 ...le_Build.patch => 02_Activate_Stable_Build.patch} |  0
 debian/patches/03_Rename_binary_to_plink1.9.patch    | 19 -------------------
 debian/patches/series                                |  4 +---
 5 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/debian/patches/01_Fix_use_internal_lib.patch b/debian/patches/01_Fix_use_internal_lib.patch
index 56070a5..0bcd4f9 100644
--- a/debian/patches/01_Fix_use_internal_lib.patch
+++ b/debian/patches/01_Fix_use_internal_lib.patch
@@ -37,7 +37,7 @@ Forwarded: No
  #include <stdlib.h>
  #include <windows.h>
 -#include "zlib-1.2.8/zlib.h"
-+#include "zlib.h"
++#include <zlib.h>
  
  void pigz_init(uint32_t setprocs) {
    return;
@@ -46,7 +46,7 @@ Forwarded: No
  #endif
  
 -#include "zlib-1.2.8/zlib.h" /* deflateInit2(), deflateReset(), deflate(), */
-+#include "zlib.h" /* deflateInit2(), deflateReset(), deflate(), */
++#include <zlib.h> /* deflateInit2(), deflateReset(), deflate(), */
                          /* deflateEnd(), deflateSetDictionary(), crc32(),
                             inflateBackInit(), inflateBack(), inflateBackEnd(),
                             Z_DEFAULT_COMPRESSION, Z_DEFAULT_STRATEGY,
@@ -57,7 +57,7 @@ Forwarded: No
  #endif // __LP64__
  
 -#include "zlib-1.2.8/zlib.h"
-+#include "zlib.h"
++#include <zlib.h>
  #include "SFMT.h"
  
  // 64MB of non-workspace memory guaranteed for now
diff --git a/debian/patches/02_Activate_Hardening.patch b/debian/patches/02_Activate_Hardening.patch
deleted file mode 100644
index d7627ed..0000000
--- a/debian/patches/02_Activate_Hardening.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Author: Dylan Aïssi <bob.dybian at gmail.com>
-Description: Activate Hardening FLAGs.
-Last-Update: 2015-01-23
-Forwarded: No
-
---- a/Makefile
-+++ b/Makefile
-@@ -57,9 +57,9 @@
- # lead to minor problems when PLINK 2.0 is released.)
- 
- plink: $(SRC)
--	g++ $(CFLAGS) $(SRC) -o plink $(BLASFLAGS) $(LINKFLAGS)
-+	g++ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC) -o plink $(BLASFLAGS) $(LINKFLAGS)
- 
- plinkw: $(SRC)
--	g++ $(CFLAGS) $(SRC) -c
--	gfortran -O2 $(OBJ) -o plink -Wl,-Bstatic $(BLASFLAGS) $(LINKFLAGS)
-+	g++ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC) -c
-+	gfortran $(FFLAGS) $(LDFLAGS) -O2 $(OBJ) -o plink -Wl,-Bstatic $(BLASFLAGS) $(LINKFLAGS)
- 
diff --git a/debian/patches/04_Activate_Stable_Build.patch b/debian/patches/02_Activate_Stable_Build.patch
similarity index 100%
rename from debian/patches/04_Activate_Stable_Build.patch
rename to debian/patches/02_Activate_Stable_Build.patch
diff --git a/debian/patches/03_Rename_binary_to_plink1.9.patch b/debian/patches/03_Rename_binary_to_plink1.9.patch
deleted file mode 100644
index d5f184e..0000000
--- a/debian/patches/03_Rename_binary_to_plink1.9.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Dylan Aïssi <bob.dybian at gmail.com>
-Description: Rename binary from plink to plink1.9 to avoid name conflict with the first plink and the plink from ssh clone putty.
-Last-Update: 2015-01-23
-Forwarded: https://github.com/chrchang/plink-ng/issues/12
-
---- a/Makefile
-+++ b/Makefile
-@@ -57,9 +57,9 @@
- # lead to minor problems when PLINK 2.0 is released.)
- 
- plink: $(SRC)
--	g++ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC) -o plink $(BLASFLAGS) $(LINKFLAGS)
-+	g++ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC) -o plink1.9 $(BLASFLAGS) $(LINKFLAGS)
- 
- plinkw: $(SRC)
- 	g++ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC) -c
--	gfortran $(FFLAGS) $(LDFLAGS) -O2 $(OBJ) -o plink -Wl,-Bstatic $(BLASFLAGS) $(LINKFLAGS)
-+	gfortran $(FFLAGS) $(LDFLAGS) -O2 $(OBJ) -o plink1.9 -Wl,-Bstatic $(BLASFLAGS) $(LINKFLAGS)
- 
diff --git a/debian/patches/series b/debian/patches/series
index d6a8598..c1895f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 01_Fix_use_internal_lib.patch
-#02_Activate_Hardening.patch
-#03_Rename_binary_to_plink1.9.patch
-04_Activate_Stable_Build.patch
+02_Activate_Stable_Build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/plink1.9.git