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

[Olivier Sallou]

Author: osallou
Date: 2014-04-09 13:16:36 +0000 (Wed, 09 Apr 2014)
New Revision: 16637

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/patches/fix_makefile
   trunk/packages/mapsembler2/trunk/debian/rules
Log:
new upstream release 2.1.2

Modified: trunk/packages/mapsembler2/trunk/debian/changelog
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/changelog	2014-04-09 12:54:44 UTC (rev 16636)
+++ trunk/packages/mapsembler2/trunk/debian/changelog	2014-04-09 13:16:36 UTC (rev 16637)
@@ -1,3 +1,9 @@
+mapsembler2 (2.1.2+dfsg-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Olivier Sallou <osallou at debian.org>  Fri, 21 Feb 2014 15:42:22 +0100
+
 mapsembler2 (2.0.31-1) unstable; urgency=low
 
   * New upstream release 

Modified: trunk/packages/mapsembler2/trunk/debian/copyright
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/copyright	2014-04-09 12:54:44 UTC (rev 16636)
+++ trunk/packages/mapsembler2/trunk/debian/copyright	2014-04-09 13:16:36 UTC (rev 16637)
@@ -1,6 +1,9 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mapsembler2
 Source: http://colibread.inria.fr/mapsembler2
+Files-Excluded:
+    visu
+    results_visualization
 
 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-04-09 12:54:44 UTC (rev 16636)
+++ trunk/packages/mapsembler2/trunk/debian/docs	2014-04-09 13:16:36 UTC (rev 16637)
@@ -1 +0,0 @@
-README

Modified: trunk/packages/mapsembler2/trunk/debian/mapsembler2.install
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/mapsembler2.install	2014-04-09 12:54:44 UTC (rev 16636)
+++ trunk/packages/mapsembler2/trunk/debian/mapsembler2.install	2014-04-09 13:16:36 UTC (rev 16637)
@@ -1,3 +1,2 @@
-mapsembler2/mapsembler usr/bin/
-mapsembler2/sample_example usr/share/doc/mapsembler2/
-mapsembler2/sample_example_results usr/share/doc/mapsembler2/
+maps/mapsembler usr/bin/
+sample_example usr/share/doc/mapsembler2/

Modified: trunk/packages/mapsembler2/trunk/debian/patches/fix_makefile
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/patches/fix_makefile	2014-04-09 12:54:44 UTC (rev 16636)
+++ trunk/packages/mapsembler2/trunk/debian/patches/fix_makefile	2014-04-09 13:16:36 UTC (rev 16637)
@@ -4,26 +4,23 @@
 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
+--- a/maps/makefile
++++ b/maps/makefile
+@@ -49,11 +49,16 @@
  
-+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)
++	$(CC) -o $@ $^ $(CFLAGS) $(LDFLAGS)
  
  %.o: %.cpp %.h 
  	$(CC) -lz -o $@ -c $< $(CFLAGS)
+ 
++CPPFLAGS=$(shell dpkg-buildflags --get CPPFLAGS)
++CFLAGS += $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
++LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
++
++
+ 
+ #%.o: %.c %.h 
+ #	$(CC) -o $@ -c $< $(CFLAGS)

Modified: trunk/packages/mapsembler2/trunk/debian/rules
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/rules	2014-04-09 12:54:44 UTC (rev 16636)
+++ trunk/packages/mapsembler2/trunk/debian/rules	2014-04-09 13:16:36 UTC (rev 16637)
@@ -13,16 +13,16 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	cd mapsembler2 && make
+	cd maps && make
 
 
 override_dh_clean:
-	cd mapsembler2 && make clean
-	rm -f mapsembler2/mapsembler
+	cd maps && make clean
+	rm -f maps/mapsembler
 	rm -f mapsembler.1
 	dh_clean
 
 override_dh_install:
-	help2man --help-option=-h --no-discard-stderr --version-string=$(SRC_VERSION) ./mapsembler2/mapsembler > mapsembler.1
+	help2man --help-option=-h --no-discard-stderr --version-string=$(SRC_VERSION) ./maps/mapsembler > mapsembler.1
 	dh_install