[med-svn] r19048 - in trunk/packages/mummer/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-04-14 09:25:25 +0000 (Tue, 14 Apr 2015)
New Revision: 19048

Added:
   trunk/packages/mummer/trunk/debian/patches/hardening.patch
   trunk/packages/mummer/trunk/debian/patches/spelling.patch
Modified:
   trunk/packages/mummer/trunk/debian/changelog
   trunk/packages/mummer/trunk/debian/patches/series
   trunk/packages/mummer/trunk/debian/rules
Log:
Propagate hardening options (+ fix spelling)


Modified: trunk/packages/mummer/trunk/debian/changelog
===================================================================
--- trunk/packages/mummer/trunk/debian/changelog	2015-04-14 08:59:38 UTC (rev 19047)
+++ trunk/packages/mummer/trunk/debian/changelog	2015-04-14 09:25:25 UTC (rev 19048)
@@ -5,6 +5,7 @@
   * cme fix dpkg-control
   * Remove SF privacy breach script from docs
   * Fix manpage syntax and add missing manpage
+  * Propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Mon, 13 Apr 2015 22:29:27 +0200
 

Added: trunk/packages/mummer/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/mummer/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/mummer/trunk/debian/patches/hardening.patch	2015-04-14 09:25:25 UTC (rev 19048)
@@ -0,0 +1,29 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 13 Apr 2015 22:29:27 +0200
+Description: Propagate hardening options
+
+--- a/Makefile
++++ b/Makefile
+@@ -122,7 +122,7 @@ scripts:
+ 
+ 
+ tigr:
+-	cd $(TIGR_SRC_DIR); $(MAKE) all
++	cd $(TIGR_SRC_DIR); $(MAKE) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" all
+ 
+ 
+ uninstall: clean
+--- a/src/tigr/Makefile
++++ b/src/tigr/Makefile
+@@ -9,9 +9,9 @@ AUX_BIN_DIR := $(CURDIR)
+ endif
+ 
+ OBJ_RULE = $(CXX) $(CXXFLAGS) $< -c -o $@
+-BIN_RULE = $(CXX) $(CXXFLAGS) $^ -o $(BIN_DIR)/$@; \
++BIN_RULE = $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $(BIN_DIR)/$@; \
+            chmod 755 $(BIN_DIR)/$@
+-AUX_BIN_RULE = $(CXX) $(CXXFLAGS) $^ -o $(AUX_BIN_DIR)/$@; \
++AUX_BIN_RULE = $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $(AUX_BIN_DIR)/$@; \
+            chmod 755 $(AUX_BIN_DIR)/$@
+ VPATH := $(AUX_BIN_DIR):$(BIN_DIR)
+ 

Modified: trunk/packages/mummer/trunk/debian/patches/series
===================================================================
--- trunk/packages/mummer/trunk/debian/patches/series	2015-04-14 08:59:38 UTC (rev 19047)
+++ trunk/packages/mummer/trunk/debian/patches/series	2015-04-14 09:25:25 UTC (rev 19048)
@@ -2,4 +2,6 @@
 02at_docs_web.diff
 enable_building_with_tetex.patch
 fix_sf_privacy_breach_issue.patch
+hardening.patch
+spelling.patch
 addition_from_mugsy.patch

Added: trunk/packages/mummer/trunk/debian/patches/spelling.patch
===================================================================
--- trunk/packages/mummer/trunk/debian/patches/spelling.patch	                        (rev 0)
+++ trunk/packages/mummer/trunk/debian/patches/spelling.patch	2015-04-14 09:25:25 UTC (rev 19048)
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Mon, 13 Apr 2015 22:29:27 +0200
+Description: Spelling
+
+--- a/src/tigr/mgaps.cc
++++ b/src/tigr/mgaps.cc
+@@ -694,7 +694,7 @@ static void  Usage
+            "\n"
+            "Clusters MUMs based on diagonals and separation.\n"
+            "Input is from stdin in format produced by mummer.\n"
+-           "Ouput goes to stdout.\n"
++           "Output goes to stdout.\n"
+            "\n"
+            "Options:\n"
+            "-C       Check that fasta header labels alternately have \"Reverse\"\n"

Modified: trunk/packages/mummer/trunk/debian/rules
===================================================================
--- trunk/packages/mummer/trunk/debian/rules	2015-04-14 08:59:38 UTC (rev 19047)
+++ trunk/packages/mummer/trunk/debian/rules	2015-04-14 09:25:25 UTC (rev 19048)
@@ -19,7 +19,7 @@
 	$(MAKE) BIN_DIR=$(BIN_DIR) AUX_BIN_DIR=$(AUX_BIN_DIR) \
 	        FINAL_BIN_DIR=$(FINAL_BIN_DIR) FINAL_AUX_BIN_DIR=$(FINAL_AUX_BIN_DIR) \
 	        FINAL_SCRIPT_DIR=$(FINAL_SCRIPT_DIR) \
-	        CFLAGS="$(CFLAGS)"
+	        CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"
 	$(MAKE) -C docs
 
 override_dh_auto_test: