[med-svn] r14311 - in trunk/packages/sim4/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-08-02 11:45:59 +0000 (Fri, 02 Aug 2013)
New Revision: 14311

Added:
   trunk/packages/sim4/trunk/debian/patches/hardening.patch
   trunk/packages/sim4/trunk/debian/patches/series
Removed:
   trunk/packages/sim4/trunk/debian/patches/Makefile.diff
Modified:
   trunk/packages/sim4/trunk/debian/changelog
Log:
Propagate hardening options


Modified: trunk/packages/sim4/trunk/debian/changelog
===================================================================
--- trunk/packages/sim4/trunk/debian/changelog	2013-08-02 11:42:25 UTC (rev 14310)
+++ trunk/packages/sim4/trunk/debian/changelog	2013-08-02 11:45:59 UTC (rev 14311)
@@ -8,6 +8,7 @@
      - debhelper 9
      - drop cdbs build-depends
   * debian/rules: short dh
+  * debian/patches/hardening.patch: propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Fri, 02 Aug 2013 13:24:50 +0200
 

Deleted: trunk/packages/sim4/trunk/debian/patches/Makefile.diff
===================================================================
--- trunk/packages/sim4/trunk/debian/patches/Makefile.diff	2013-08-02 11:42:25 UTC (rev 14310)
+++ trunk/packages/sim4/trunk/debian/patches/Makefile.diff	2013-08-02 11:45:59 UTC (rev 14311)
@@ -1,14 +0,0 @@
-diff -Nur sim4-0.0.20030921/Makefile sim4-0.0.20030921.new/Makefile
---- sim4-0.0.20030921/Makefile	2003-09-21 13:55:12.000000000 -0300
-+++ sim4-0.0.20030921.new/Makefile	2007-08-15 12:00:04.000000000 -0300
-@@ -3,8 +3,8 @@
- # the best optimization flag is for your computer.
- # For Sun's compilers under Solaris, ``-fast'' works well.
- # For gcc, ``-O2'' works well.
--CC=cc
--CFLAGS=-O
-+CC=gcc
-+CFLAGS=-g -O2 -Wall
- LDLIBS=-lm
-  
- sim4:

Added: trunk/packages/sim4/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/sim4/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/sim4/trunk/debian/patches/hardening.patch	2013-08-02 11:45:59 UTC (rev 14311)
@@ -0,0 +1,19 @@
+Author: Andreas Tille <tille at debian.org>
+LastChanged: Fri, 02 Aug 2013 13:24:50 +0200
+Description: Propagate hardening options
+
+--- a/Makefile
++++ b/Makefile
+@@ -4,10 +4,10 @@
+ # For Sun's compilers under Solaris, ``-fast'' works well.
+ # For gcc, ``-O2'' works well.
+ CC=cc
+-CFLAGS=-O
++CFLAGS+=-g -O2 -Wall
+ LDLIBS=-lm
+  
+ sim4:
+-	$(CC) -o sim4 -I. $(CFLAGS) *.c $(LDLIBS)
++	$(CC) -o sim4 -I. $(CFLAGS) *.c $(LDLIBS) $(LDFLAGS)
+ clean:
+ 	rm -f sim4 *.o

Added: trunk/packages/sim4/trunk/debian/patches/series
===================================================================
--- trunk/packages/sim4/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/sim4/trunk/debian/patches/series	2013-08-02 11:45:59 UTC (rev 14311)
@@ -0,0 +1 @@
+hardening.patch