[med-svn] r20677 - trunk/packages/clonalframe/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-12-08 17:57:35 +0000 (Tue, 08 Dec 2015)
New Revision: 20677

Modified:
   trunk/packages/clonalframe/trunk/debian/changelog
   trunk/packages/clonalframe/trunk/debian/control
   trunk/packages/clonalframe/trunk/debian/rules
Log:
hardening, first person in description, upload to unstable


Modified: trunk/packages/clonalframe/trunk/debian/changelog
===================================================================
--- trunk/packages/clonalframe/trunk/debian/changelog	2015-12-08 17:21:12 UTC (rev 20676)
+++ trunk/packages/clonalframe/trunk/debian/changelog	2015-12-08 17:57:35 UTC (rev 20677)
@@ -1,4 +1,4 @@
-clonalframe (1.2-4) UNRELEASED; urgency=low
+clonalframe (1.2-4) unstable; urgency=low
 
   [ Andreas Tille ]
   * debian/upstream/metadata:
@@ -7,12 +7,14 @@
      - add PMID+eprint
   * cme fix dpkg-control
   * debhelper 9
+  * hardening flags
+  * do not use first person in long description
 
   [ Bas Couwenberg ]
   * Update build dependencies for GSL 2, change libgsl0-dev to libgsl-dev.
     Closes: #807240
 
- -- Andreas Tille <tille at debian.org>  Tue, 08 Dec 2015 18:16:41 +0100
+ -- Andreas Tille <tille at debian.org>  Tue, 08 Dec 2015 18:21:44 +0100
 
 clonalframe (1.2-3) unstable; urgency=low
 

Modified: trunk/packages/clonalframe/trunk/debian/control
===================================================================
--- trunk/packages/clonalframe/trunk/debian/control	2015-12-08 17:21:12 UTC (rev 20676)
+++ trunk/packages/clonalframe/trunk/debian/control	2015-12-08 17:57:35 UTC (rev 20677)
@@ -26,6 +26,6 @@
  MLST data, where 7 gene fragments have been sequenced, but becomes
  progressively more powerful as the sequenced regions increase in length
  and number up to whole genomes. However, it requires the sequences to be
- aligned. If you have genomic data that is not aligned, we recommend
- using Mauve which produces alignment of whole bacterial genomes in
+ aligned. If you have genomic data that is not aligned, it is recommend to
+ use Mauve which produces alignment of whole bacterial genomes in
  exactly the format required for analysis with ClonalFrame.

Modified: trunk/packages/clonalframe/trunk/debian/rules
===================================================================
--- trunk/packages/clonalframe/trunk/debian/rules	2015-12-08 17:21:12 UTC (rev 20676)
+++ trunk/packages/clonalframe/trunk/debian/rules	2015-12-08 17:57:35 UTC (rev 20677)
@@ -14,7 +14,12 @@
 	rm -rf bin build Makefile
 
 override_dh_auto_build:
-	qmake; $(MAKE)
+	qmake
+	# did not found a better way to push hardening flags into Makefile
+	sed -i -e "s/CFLAGS *= .*/& $(CFLAGS)/" \
+	       -e "s/CXXFLAGS *= .*/& $(CXXFLAGS)/" \
+	       -e "s/LFLAGS *= .*/& $(LDFLAGS)/" Makefile
+	$(MAKE)
 
 get-orig-source:
 	. debian/get-orig-source