[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. debian/0.15.0_dfsg-1-3-g6c797e5

[Anton Gladky]

The following commit has been merged in the master branch:
commit 956cf125010f835f1f8a9428feb30d9686375f59
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun May 27 16:28:37 2012 +0200

    Replace /usr/bin/netgen binary on /usr/bin/netgensumo. (Closes: #673931)

diff --git a/debian/patches/fix_manpage_output.patch b/debian/patches/fix_manpage_output.patch
index f63d5c5..4ddebae 100644
--- a/debian/patches/fix_manpage_output.patch
+++ b/debian/patches/fix_manpage_output.patch
@@ -1,10 +1,10 @@
 Description: fixes manpage NAME field
 Author: Anton Gladk <gladky.anton at gmail.com>
-Last-Update: 2012-04-23
+Last-Update: 2012-05-27
 
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -743,7 +743,16 @@
+@@ -743,7 +743,18 @@
  man:
  	rm -rf docs/man
  	mkdir docs/man
@@ -16,7 +16,9 @@ Last-Update: 2012-04-23
 +	help2man -N -n "Generates routes of persons throughout a day for the microscopic road traffic simulation SUMO" bin/activitygen > docs/man/activitygen.1
 +	help2man -N -n "Importer of O/D-matrices for the road traffic simulation SUMO" bin/od2trips > docs/man/od2trips.1
 +	help2man -N -n "Road network importer / builder for the road traffic simulation SUMO" bin/netconvert > docs/man/netconvert.1
-+	help2man -N -n "Road network generator for the microscopic road traffic simulation SUMO" bin/netgen > docs/man/netgen.1
++	help2man -N -n "Road network generator for the microscopic road traffic simulation SUMO" bin/netgen > docs/man/netgensumo.1
++	sed -i 's/netgen/netgensumo/g' docs/man/netgensumo.1
++	sed -i 's/NETGEN/NETGENSUMO/g' docs/man/netgensumo.1
 +	help2man -N -n "Importer of polygons and POIs for the road traffic simulation SUMO" bin/polyconvert > docs/man/polyconvert.1
 +	help2man -N -n "TraciTestClient for the road traffic simulation SUMO" bin/TraCITestClient > docs/man/TraCITestClient.1
  
diff --git a/debian/rules b/debian/rules
index e224495..2f2cf3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,10 @@ override_dh_auto_build-indep:
 override_dh_auto_build-arch:
 	dh_auto_build -a
 	$(MAKE) man
+	
+override_dh_auto_install-arch:
+	dh_auto_install -a
+	mv $(CURDIR)/debian/tmp/usr/bin/netgen $(CURDIR)/debian/tmp/usr/bin/netgensumo
 
 override_dh_auto_test-arch:
 	mkdir $(CURDIR)/tests
diff --git a/debian/sumo.install b/debian/sumo.install
index 48fd50c..ad5fc53 100644
--- a/debian/sumo.install
+++ b/debian/sumo.install
@@ -1,3 +1,13 @@
-usr/bin
+usr/bin/sumo
+usr/bin/sumo-gui
+usr/bin/dfrouter
+usr/bin/duarouter
+usr/bin/jtrrouter
+usr/bin/activitygen
+usr/bin/od2trips
+usr/bin/netconvert
+usr/bin/netgensumo
+usr/bin/polyconvert
+usr/bin/TraCITestClient
 debian/*.xpm /usr/share/pixmaps
 debian/sumo.desktop /usr/share/applications

-- 
SUMO packaging. Simulation of Urban MObility.