[med-svn] r14436 - in trunk/packages/melting/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2013-08-11 12:01:15 +0000 (Sun, 11 Aug 2013)
New Revision: 14436

Added:
   trunk/packages/melting/trunk/debian/patches/hardening.patch
Modified:
   trunk/packages/melting/trunk/debian/changelog
   trunk/packages/melting/trunk/debian/patches/series
Log:
propagate hardening options and upload to unstable


Modified: trunk/packages/melting/trunk/debian/changelog
===================================================================
--- trunk/packages/melting/trunk/debian/changelog	2013-08-11 11:41:41 UTC (rev 14435)
+++ trunk/packages/melting/trunk/debian/changelog	2013-08-11 12:01:15 UTC (rev 14436)
@@ -1,4 +1,4 @@
-melting (4.3.1+dfsg-1) UNRELEASED; urgency=low
+melting (4.3.1+dfsg-1) unstable; urgency=low
 
   [ Thorsten Alteholz ]
   * new upstream version
@@ -11,6 +11,7 @@
      - anonscm for Vcs fields
   * debian/copyright: Add Files-Excluded
   * debian/watch: handle +dfsg suffix
+  * debian/patch/hardening.patch: propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Sun, 11 Aug 2013 11:51:52 +0200
 

Added: trunk/packages/melting/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/melting/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/melting/trunk/debian/patches/hardening.patch	2013-08-11 12:01:15 UTC (rev 14436)
@@ -0,0 +1,23 @@
+Description: Enable propagation of hardening flags
+Author: Andreas Tille <tille at debian.org>
+Date: Sun, 11 Aug 2013 11:51:52 +0200
+
+--- a/makefile.unices
++++ b/makefile.unices
+@@ -47,14 +47,14 @@ VPATH = $(srcdir)
+ # Here add your compiler name and the chosen options
+ CC = gcc
+ # options to produce the release version
+-CFLAGS = -Wall -pedantic -O3 -DNN_BASE=\"$(NNDIR)\"
++CFLAGS += -Wall -pedantic -O3 -DNN_BASE=\"$(NNDIR)\"
+ # options to produce a version to debug and prof
+ #CFLAGS = -Wall -pedantic -g -DNN_BASE=\"$(NNDIR)\"
+ 
+ OBJECTS = melting.o decode.o calcul.o
+ 
+ all : $(OBJECTS)
+-	$(CC) $(CFLAGS) -o melting $(OBJECTS) -lm
++	$(CC) $(CFLAGS) -o melting $(OBJECTS) $(LDFLAGS) -lm
+ 
+ $(OBJECTS) : common.h
+ melting.o : melting.c melting.h

Modified: trunk/packages/melting/trunk/debian/patches/series
===================================================================
--- trunk/packages/melting/trunk/debian/patches/series	2013-08-11 11:41:41 UTC (rev 14435)
+++ trunk/packages/melting/trunk/debian/patches/series	2013-08-11 12:01:15 UTC (rev 14436)
@@ -1,2 +1,3 @@
 tkmelting.patch
 20_fix_manpage.patch
+hardening.patch