[med-svn] r18039 - trunk/packages/prodigal/trunk/debian/patches

[Andreas Tille]

Author: tille
Date: 2014-09-16 07:13:02 +0000 (Tue, 16 Sep 2014)
New Revision: 18039

Added:
   trunk/packages/prodigal/trunk/debian/patches/hardening.patch
Removed:
   trunk/packages/prodigal/trunk/debian/patches/add_hardening
   trunk/packages/prodigal/trunk/debian/patches/prevent_compilation_at_clean
Modified:
   trunk/packages/prodigal/trunk/debian/patches/series
Log:
Adapt patches to new upstream version


Deleted: trunk/packages/prodigal/trunk/debian/patches/add_hardening
===================================================================
--- trunk/packages/prodigal/trunk/debian/patches/add_hardening	2014-09-16 07:12:31 UTC (rev 18038)
+++ trunk/packages/prodigal/trunk/debian/patches/add_hardening	2014-09-16 07:13:02 UTC (rev 18039)
@@ -1,20 +0,0 @@
-Author: Olivier Sallou <osallou at debian.org>
-Subject: add Debian hardening
-Description: add compilation hardening flags
-Forwarded: no
-Last-Updated: 2014-07-28
---- a/Makefile
-+++ b/Makefile
-@@ -32,10 +32,10 @@
- 
- EXEC=	prodigal
- 
--CFLAGS=	-O3 -Wall
-+CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -O3 -Wall
- 
- LIBS=	-lm
--LDFLAGS=	$(LIBS)
-+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) $(LIBS)
- 
- OBJS=	${SRC:.c=.o}
- 

Added: trunk/packages/prodigal/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/prodigal/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/prodigal/trunk/debian/patches/hardening.patch	2014-09-16 07:13:02 UTC (rev 18039)
@@ -0,0 +1,19 @@
+Author: Olivier Sallou <osallou at debian.org>
+Subject: add Debian hardening
+Description: add compilation hardening flags
+Forwarded: no
+Last-Updated: Tue, 16 Sep 2014 08:59:43 +0200
+
+--- a/Makefile
++++ b/Makefile
+@@ -21,8 +21,8 @@
+ SHELL   = /bin/sh
+ CC      = gcc
+ 
+-CFLAGS  = -pedantic -Wall -O3
+-LFLAGS = -lm
++CFLAGS += -pedantic -Wall -O3
++LFLAGS = -lm $(LDFLAGS)
+ 
+ TARGET  = prodigal
+ SOURCES = $(shell echo *.c)

Deleted: trunk/packages/prodigal/trunk/debian/patches/prevent_compilation_at_clean
===================================================================
--- trunk/packages/prodigal/trunk/debian/patches/prevent_compilation_at_clean	2014-09-16 07:12:31 UTC (rev 18038)
+++ trunk/packages/prodigal/trunk/debian/patches/prevent_compilation_at_clean	2014-09-16 07:13:02 UTC (rev 18039)
@@ -1,19 +0,0 @@
-Author: Olivier Sallou <osallou at debian.org>
-Subject: remove compilation before clean
-Description: clean target makes a compilation before cleanup
- Force removal of objects instead of generating them first.
-Last-Updated: 2014-07-28
-Forwarded: no
---- a/Makefile
-+++ b/Makefile
-@@ -41,8 +41,8 @@
- 
- all:	$(SRC) $(EXEC)
- 
--clean:	$(OBJS)
--	/bin/rm -rf $(OBJS) $(EXEC)
-+clean:
-+	/bin/rm -rf *.o prodigal
- 
- $(EXEC):	$(OBJS)
- 	$(CC) -o $@ $(OBJS) $(LDFLAGS) $(CFLAGS)

Modified: trunk/packages/prodigal/trunk/debian/patches/series
===================================================================
--- trunk/packages/prodigal/trunk/debian/patches/series	2014-09-16 07:12:31 UTC (rev 18038)
+++ trunk/packages/prodigal/trunk/debian/patches/series	2014-09-16 07:13:02 UTC (rev 18039)
@@ -1,2 +1 @@
-prevent_compilation_at_clean
-add_hardening
+hardening.patch