[med-svn] r16479 - in trunk/packages/raxml/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-03-19 13:29:16 +0000 (Wed, 19 Mar 2014)
New Revision: 16479

Added:
   trunk/packages/raxml/trunk/debian/patches/
   trunk/packages/raxml/trunk/debian/patches/hardening.patch
   trunk/packages/raxml/trunk/debian/patches/series
Modified:
   trunk/packages/raxml/trunk/debian/changelog
   trunk/packages/raxml/trunk/debian/examples
   trunk/packages/raxml/trunk/debian/rules
Log:
Hardening, fixing Perl path in examples


Modified: trunk/packages/raxml/trunk/debian/changelog
===================================================================
--- trunk/packages/raxml/trunk/debian/changelog	2014-03-19 13:18:06 UTC (rev 16478)
+++ trunk/packages/raxml/trunk/debian/changelog	2014-03-19 13:29:16 UTC (rev 16479)
@@ -7,6 +7,7 @@
   * Remove outdated README.Debian
   * cme fix dpkg-control
   * Update homepage
+  * debian/patches/hardening.patch: Propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Wed, 19 Mar 2014 14:11:26 +0100
 

Modified: trunk/packages/raxml/trunk/debian/examples
===================================================================
--- trunk/packages/raxml/trunk/debian/examples	2014-03-19 13:18:06 UTC (rev 16478)
+++ trunk/packages/raxml/trunk/debian/examples	2014-03-19 13:29:16 UTC (rev 16479)
@@ -1 +1 @@
-usefulScripts/*
+usefulScripts/*.sh

Added: trunk/packages/raxml/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/raxml/trunk/debian/patches/hardening.patch	                        (rev 0)
+++ trunk/packages/raxml/trunk/debian/patches/hardening.patch	2014-03-19 13:29:16 UTC (rev 16479)
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Updated: Wed, 19 Mar 2014 14:11:26 +0100
+Description: Propagate hardening options
+
+--- a/Makefile.gcc
++++ b/Makefile.gcc
+@@ -17,7 +17,7 @@ all : raxmlHPC
+ GLOBAL_DEPS = axml.h globalVariables.h rmq.h rmqs.h #mem_alloc.h
+ 
+ raxmlHPC : $(objs)
+-	$(CC) -o raxmlHPC $(objs) $(LIBRARIES) 
++	$(CC) -o raxmlHPC $(objs) $(LIBRARIES) $(LDFLAGS)
+ 
+ rmqs.o : rmqs.c $(GLOBAL_DEPS)
+ classify.o : classify.c $(GLOBAL_DEPS)

Added: trunk/packages/raxml/trunk/debian/patches/series
===================================================================
--- trunk/packages/raxml/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/raxml/trunk/debian/patches/series	2014-03-19 13:29:16 UTC (rev 16479)
@@ -0,0 +1 @@
+hardening.patch

Modified: trunk/packages/raxml/trunk/debian/rules
===================================================================
--- trunk/packages/raxml/trunk/debian/rules	2014-03-19 13:18:06 UTC (rev 16478)
+++ trunk/packages/raxml/trunk/debian/rules	2014-03-19 13:29:16 UTC (rev 16479)
@@ -3,6 +3,7 @@
 # Copyright (C) Andreas Tille <tille at debian.org>
 # License: GPL
 
+DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
 exe=raxmlHPC
 
 %:
@@ -17,12 +18,15 @@
 override_dh_auto_install:
 	help2man --no-info --help-option="-h" --version-option="-v" \
 	         --name="Randomized Axelerated Maximum Likelihood" \
-	         $(CURDIR)/$(exe) > $(CURDIR)/debian/`dh_listpackages`/usr/share/man/man1/$(exe).1
+	         $(CURDIR)/$(exe) > $(CURDIR)/debian/$(DEBPKGNAME)/usr/share/man/man1/$(exe).1
 
+override_dh_installexamples:
+	dh_installexamples
+	# fix perl path in example scripts
+	for pscript in `ls usefulScripts/*.pl` ; do \
+	    sed 's?/usr/local/bin/perl?/usr/bin/perl?' $${pscript} > $(CURDIR)/debian/$(DEBPKGNAME)/usr/share/doc/$(DEBPKGNAME)/examples/`basename $${pscript}` ; \
+	done
+
 get-orig-source:
 	mkdir -p ../tarballs
 	uscan --verbose --force-download --destdir=../tarballs
-	## Upstream suggests to package what is called alpha on the web page
-	#@echo "The watch file fails in reporting non-Alpha versions."
-	#@echo "Just go to http://sco.h-its.org/exelixis/software.html"
-	#@echo "and download the latest non-Alpha version."