[Pkg-osm-commits] [SCM] monav branch, master, updated. upstream/0.2+svn405-36-g350b43d

[David Paleino]

The following commit has been merged in the master branch:
commit 76592327e285af5d1fd528d25b9dc9384c89ed98
Author: David Paleino <dapal at debian.org>
Date:   Fri Mar 11 17:20:44 2011 +0100

    Upstream now uses sane binary names, drop the hackery in debian/rules, and install proper files in debian/*.install

diff --git a/debian/changelog b/debian/changelog
index bfd4db6..da5550a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ monav (0.2+svn450-1) UNRELEASED; urgency=low
     upstream)
   * Fix various FTBFS issues (01-fix_build_issues.patch)
   * Also build monav-preprocessor-gui and monav-packager
+  * Upstream now uses sane binary names, drop the hackery in
+    debian/rules, and install proper files in debian/*.install
 
- -- David Paleino <dapal at debian.org>  Fri, 11 Mar 2011 17:09:42 +0100
+ -- David Paleino <dapal at debian.org>  Fri, 11 Mar 2011 17:20:17 +0100
 
 monav (0.2+svn405-1) experimental; urgency=low
 
diff --git a/debian/monav-client.install b/debian/monav-client.install
index e976b25..c268522 100644
--- a/debian/monav-client.install
+++ b/debian/monav-client.install
@@ -1 +1 @@
-bin/MoNavC	/usr/bin/
+bin/monav	/usr/bin/
diff --git a/debian/monav-preprocessor.install b/debian/monav-preprocessor.install
index c7db20d..b4b3372 100644
--- a/debian/monav-preprocessor.install
+++ b/debian/monav-preprocessor.install
@@ -1 +1,3 @@
-bin/MoNavP	/usr/bin/
+bin/monav-preprocessor		/usr/bin/
+bin/monav-preprocessor-gui	/usr/bin/
+monav-packager				/usr/bin/
diff --git a/debian/monav-routing-daemon.install b/debian/monav-routing-daemon.install
index a1b2cf9..fa7cd2f 100644
--- a/debian/monav-routing-daemon.install
+++ b/debian/monav-routing-daemon.install
@@ -1 +1 @@
-bin/MoNavD	/usr/bin/
+bin/monav-daemon	/usr/bin/
diff --git a/debian/rules b/debian/rules
index cfa3c22..b2e02d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,18 +29,6 @@ override_dh_auto_build:
 	    $(MAKE) -f Makefile.$$i ; \
 	done
 
-override_dh_install:
-	dh_install
-
-	mv $(CURDIR)/debian/monav-client/usr/bin/MoNavC \
-	    $(CURDIR)/debian/monav-client/usr/bin/monav-client
-
-	mv $(CURDIR)/debian/monav-preprocessor/usr/bin/MoNavP \
-	    $(CURDIR)/debian/monav-preprocessor/usr/bin/monav-preprocessor
-
-	mv $(CURDIR)/debian/monav-routing-daemon/usr/bin/MoNavD \
-	    $(CURDIR)/debian/monav-routing-daemon/usr/bin/monav-routing-daemon
-
 override_dh_auto_clean: configure
 	for i in client preprocessor preprocessor-gui routingdaemon monav-packager; do \
 	    $(MAKE) -f Makefile.$$i distclean; \

-- 
fast navigation system featuring exact routing