[wcslib] 05/11: Remove unneeded fortify patch

Ole Streicher olebole at moszumanska.debian.org
Wed Apr 8 09:06:40 UTC 2015


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

olebole pushed a commit to branch debian
in repository wcslib.

commit 5692b01c352f321feef7841d9b4cfbd86d56a9cd
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Apr 8 09:58:53 2015 +0200

    Remove unneeded fortify patch
---
 debian/changelog             |  5 +++--
 debian/patches/fortify.patch | 45 --------------------------------------------
 debian/patches/series        |  1 -
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c2859f1..0a36119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-wcslib (4.25.1-1~exp2) UNRELEASED; urgency=low
+wcslib (5.1-1) UNRELEASED; urgency=low
 
+  * New upstream version
   * Update standards version to 3.9.6. No changes needed.
 
- -- Ole Streicher <olebole at debian.org>  Wed, 07 Jan 2015 13:58:04 +0100
+ -- Ole Streicher <olebole at debian.org>  Tue, 07 Apr 2015 15:37:59 +0200
 
 wcslib (4.25.1-1~exp1) experimental; urgency=low
 
diff --git a/debian/patches/fortify.patch b/debian/patches/fortify.patch
deleted file mode 100644
index a88779d..0000000
--- a/debian/patches/fortify.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Debian wants to add --D_FORTIFY_SOURCE=2 to CPPFLAGS. This
- patch propagates that to the build process.
---- a/makedefs.in
-+++ b/makedefs.in
-@@ -89,7 +89,7 @@
- 
- # C preprocessor and options.
-   CPP      := @CPP@
--  CPPFLAGS := @DEFS@
-+  CPPFLAGS := @CPPFLAGS@ @DEFS@
-   WCSTRIG  := WRAPPER
- 
- # C compiler and options.
---- a/Fortran/GNUmakefile
-+++ b/Fortran/GNUmakefile
-@@ -117,7 +117,7 @@
- 
- $(PICLIB)(%.o) : %.c
- 	-@ echo ''
--	   $(CC) $(CPPFLAGS) $(SHRFLAGS) -c $<
-+	   $(CC) $(CPPFLAGS) $(CFLAGS) $(SHRFLAGS) -c $<
- 	   $(AR) r $(PICLIB) $%
- 	-@ $(RM) $%
- 
-@@ -297,7 +297,7 @@
- 	   $(MAKE) -C ../pgsbox lib
- 
- tofits : ../C/test/tofits.c
--	   $(CC) $(CFLAGS) -o $@ $<
-+	   $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
- 
- pih.fits : ../C/test/pih.keyrec tofits
- 	   sed '/^BADKEYREC/q' $< | ./tofits > $@
---- a/C/GNUmakefile
-+++ b/C/GNUmakefile
-@@ -346,7 +346,7 @@
- 	   $(MAKE) -C ../pgsbox $(notdir $@)
- 
- tofits : test/tofits.c
--	   $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ $<
-+	   $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
- 
- pih.fits : test/pih.keyrec tofits
- 	   ./tofits < $< > $@
diff --git a/debian/patches/series b/debian/patches/series
index d548fb6..2ffb5c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 increase_tspx_test_tol.patch
 disable_Ftspx_test.patch
-fortify.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/wcslib.git



More information about the debian-science-commits mailing list