[med-svn] r16076 - in trunk/packages/mapsembler2/trunk/debian: . patches

[Olivier Sallou]

Author: osallou
Date: 2014-02-21 14:36:36 +0000 (Fri, 21 Feb 2014)
New Revision: 16076

Added:
   trunk/packages/mapsembler2/trunk/debian/patches/fix_makefile
Modified:
   trunk/packages/mapsembler2/trunk/debian/changelog
   trunk/packages/mapsembler2/trunk/debian/copyright
   trunk/packages/mapsembler2/trunk/debian/docs
   trunk/packages/mapsembler2/trunk/debian/mapsembler2.install
   trunk/packages/mapsembler2/trunk/debian/mapsembler2.manpages
   trunk/packages/mapsembler2/trunk/debian/patches/series
   trunk/packages/mapsembler2/trunk/debian/rules
Log:
adapt to new version

Modified: trunk/packages/mapsembler2/trunk/debian/changelog
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/changelog	2014-02-21 14:14:15 UTC (rev 16075)
+++ trunk/packages/mapsembler2/trunk/debian/changelog	2014-02-21 14:36:36 UTC (rev 16076)
@@ -1,4 +1,4 @@
-mapsembler2 (2.0.31+dfsg-1) UNRELEASED; urgency=low
+mapsembler2 (2.0.31-1) UNRELEASED; urgency=low
 
   * New upstream release 
 

Modified: trunk/packages/mapsembler2/trunk/debian/copyright
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/copyright	2014-02-21 14:14:15 UTC (rev 16075)
+++ trunk/packages/mapsembler2/trunk/debian/copyright	2014-02-21 14:36:36 UTC (rev 16076)
@@ -1,7 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mapsembler2
 Source: http://colibread.inria.fr/mapsembler2
-Files-Excluded: visu
 
 License: CeCILL
  This Agreement is a free software license that is the result of  discussions

Modified: trunk/packages/mapsembler2/trunk/debian/docs
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/docs	2014-02-21 14:14:15 UTC (rev 16075)
+++ trunk/packages/mapsembler2/trunk/debian/docs	2014-02-21 14:36:36 UTC (rev 16076)
@@ -0,0 +1 @@
+README

Modified: trunk/packages/mapsembler2/trunk/debian/mapsembler2.install
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/mapsembler2.install	2014-02-21 14:14:15 UTC (rev 16075)
+++ trunk/packages/mapsembler2/trunk/debian/mapsembler2.install	2014-02-21 14:36:36 UTC (rev 16076)
@@ -1,4 +1,3 @@
-kissreads_g/kissreads_graph usr/bin/
-maps/mapsembler usr/bin/
-run_mapsembler_and_phaser usr/bin
-sample_example usr/share/doc/mapsembler2/
+mapsembler2/mapsembler usr/bin/
+mapsembler2/sample_example usr/share/doc/mapsembler2/
+mapsembler2/sample_example_results usr/share/doc/mapsembler2/

Modified: trunk/packages/mapsembler2/trunk/debian/mapsembler2.manpages
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/mapsembler2.manpages	2014-02-21 14:14:15 UTC (rev 16075)
+++ trunk/packages/mapsembler2/trunk/debian/mapsembler2.manpages	2014-02-21 14:36:36 UTC (rev 16076)
@@ -1,3 +1 @@
-run_mapsembler_and_phaser.1
 mapsembler.1
-kissreads_graph.1

Added: trunk/packages/mapsembler2/trunk/debian/patches/fix_makefile
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/patches/fix_makefile	                        (rev 0)
+++ trunk/packages/mapsembler2/trunk/debian/patches/fix_makefile	2014-02-21 14:36:36 UTC (rev 16076)
@@ -0,0 +1,29 @@
+Subject: Add hardening
+Description: makefiles do not import default CFLAGS,...
+this patch add debian cflags for hardening
+Forwarded: no
+Author: Olivier Sallou <osallou at debian.org>
+Last-Updated: 2014-02-21
+--- a/mapsembler2/makefile
++++ b/mapsembler2/makefile
+@@ -5,6 +5,11 @@
+ CFLAGS=  -g -lz -DMINIA_IS_IN_PARENT_FOLDER
+ #CFLAGS=  -O3 -lz -DMINIA_IS_IN_PARENT_FOLDER
+ 
++CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
++CFLAGS += $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
++LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
++
++
+ 
+ #CFLAGS=  -g -lz --std=gnu++0x -DMINIA_IS_IN_PARENT_FOLDER
+ #CFLAGS=  -g -lz -DMINIA_IS_IN_PARENT_FOLDER
+@@ -54,7 +59,7 @@
+ 
+ mapsembler:  $(OBJ) $(OBJ2) mapsembler.cpp
+ #mapsembler:  $(OBJ) $(OBJ2) test.cpp
+-	$(CC) -o $@ $^ $(CFLAGS) 
++	$(CC) -o $@ $^ $(CFLAGS)  $(LDFLAGS)
+ 
+ %.o: %.cpp %.h 
+ 	$(CC) -lz -o $@ -c $< $(CFLAGS)

Modified: trunk/packages/mapsembler2/trunk/debian/patches/series
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/patches/series	2014-02-21 14:14:15 UTC (rev 16075)
+++ trunk/packages/mapsembler2/trunk/debian/patches/series	2014-02-21 14:36:36 UTC (rev 16076)
@@ -1,2 +1 @@
-fix_build
-fix_path
+fix_makefile

Modified: trunk/packages/mapsembler2/trunk/debian/rules
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/rules	2014-02-21 14:14:15 UTC (rev 16075)
+++ trunk/packages/mapsembler2/trunk/debian/rules	2014-02-21 14:36:36 UTC (rev 16076)
@@ -13,26 +13,16 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	cd maps && make k=29
-	cd kissreads_g && make k=29
+	cd mapsembler2 && make
 
 
 override_dh_clean:
-	cd minia && make clean
-	cd kissreads_g && make clean
-	cd maps && make clean
-	rm -f maps/mapsembler
-	rm -f kissreads_g/kissreads_graph
-	rm -f run_mapsembler_and_phaser
-	rm -f run_mapsembler_and_phaser.1
+	cd mapsembler2 && make clean
+	rm -f mapsembler2/mapsembler
 	rm -f mapsembler.1
-	rm -f kissreads_graph.1
 	dh_clean
 
 override_dh_install:
-	cp run_mapsembler_and_phaser.sh run_mapsembler_and_phaser
-	help2man --help-option=-h --version-string=$(SRC_VERSION) ./run_mapsembler_and_phaser > run_mapsembler_and_phaser.1
-	help2man --help-option=-h --no-discard-stderr --version-string=$(SRC_VERSION) ./maps/mapsembler > mapsembler.1
-	help2man --help-option=-h --no-discard-stderr --version-string=$(SRC_VERSION) ./kissreads_g/kissreads_graph > kissreads_graph.1
+	help2man --help-option=-h --no-discard-stderr --version-string=$(SRC_VERSION) ./mapsembler2/mapsembler > mapsembler.1
 	dh_install