[med-svn] r21200 - in trunk/packages/njplot/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-01-15 10:42:30 +0000 (Fri, 15 Jan 2016)
New Revision: 21200

Added:
   trunk/packages/njplot/trunk/debian/patches/hardening.patch
Modified:
   trunk/packages/njplot/trunk/debian/changelog
   trunk/packages/njplot/trunk/debian/patches/series
   trunk/packages/njplot/trunk/debian/rules
Log:
Propagate hardening options


Modified: trunk/packages/njplot/trunk/debian/changelog
===================================================================
--- trunk/packages/njplot/trunk/debian/changelog	2016-01-15 10:16:10 UTC (rev 21199)
+++ trunk/packages/njplot/trunk/debian/changelog	2016-01-15 10:42:30 UTC (rev 21200)
@@ -9,6 +9,7 @@
   * debhelper 9
   * Build using dh instead of cdbs
   * Add missing DEP3 header
+  * Propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Fri, 15 Jan 2016 10:56:56 +0100
 

Added: trunk/packages/njplot/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/njplot/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/njplot/trunk/debian/patches/hardening.patch	2016-01-15 10:42:30 UTC (rev 21200)
@@ -0,0 +1,36 @@
+Description: Propagate hardening options
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 15 Jan 2016 10:56:56 +0100
+
+--- a/makefile
++++ b/makefile
+@@ -16,24 +16,24 @@ OBJECTS = njplot-vib.o
+ OBJUNROOTED = unrooted-vib.o preptree.o
+ 
+ 
+-CFLAGS  = -c -DWIN_MOTIF -Dunix -I$(VIBRANT) $(HELPFILENAME) $(NO_PDF)
++CFLAGS += -c -DWIN_MOTIF -Dunix -I$(VIBRANT) $(HELPFILENAME) $(NO_PDF)
+ 	
+ all: njplot  unrooted newicktops newicktotxt
+ 
+ 
+ njplot : $(OBJECTS)
+ 	$(CC) -o njplot $(OBJECTS) \
+-        -lvibrant -lncbi -lXm -lXt -lm
++        -lvibrant -lncbi -lXm -lXt -lm $(LDFLAGS)
+         
+ unrooted : $(OBJUNROOTED)
+ 	$(CC) -o unrooted $(OBJUNROOTED) \
+-        -lvibrant -lncbi -lXm -lXt -lm
++        -lvibrant -lncbi -lXm -lXt -lm $(LDFLAGS)
+ 
+ newicktops: njplot-vib.c
+-	$(CC) -DNO_GUI  -DNO_PDF -o $@ njplot-vib.c -lm
++	$(CC) -DNO_GUI  -DNO_PDF -o $@ njplot-vib.c -lm $(LDFLAGS)
+ 
+ newicktotxt: njplot-vib.c
+-	$(CC) -DTTY  -o $@ njplot-vib.c -lm
++	$(CC) -DTTY  -o $@ njplot-vib.c -lm $(LDFLAGS)
+ 
+ 
+ .c.o : 

Modified: trunk/packages/njplot/trunk/debian/patches/series
===================================================================
--- trunk/packages/njplot/trunk/debian/patches/series	2016-01-15 10:16:10 UTC (rev 21199)
+++ trunk/packages/njplot/trunk/debian/patches/series	2016-01-15 10:42:30 UTC (rev 21200)
@@ -1 +1,2 @@
 fix-underlinking.patch
+hardening.patch

Modified: trunk/packages/njplot/trunk/debian/rules
===================================================================
--- trunk/packages/njplot/trunk/debian/rules	2016-01-15 10:16:10 UTC (rev 21199)
+++ trunk/packages/njplot/trunk/debian/rules	2016-01-15 10:42:30 UTC (rev 21200)
@@ -1,15 +1,5 @@
 #!/usr/bin/make -f
 
-CFLAGS += -c -I/usr/include/ncbi -DNO_PDF -DWIN_MOTIF \
-          -DHELPFILENAME=\\\"/usr/share/njplot/njplot.help\\\"
-
 %:
 	dh $@
 
-override_dh_auto_clean:
-	dh_auto_clean
-	make distclean
-
-override_dh_auto_build:
-	CC='gcc $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS)' $(MAKE)
-