Moved osm2navit to its own binary package.

Reworked debian/ files to let dh do its work when possible.

diff --git a/debian/README.Debian b/debian/README.Debian
index c7cd37d..a7558a2 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,7 +2,7 @@ navit for Debian
 ----------------
 
 Navit is a young and volatile software. Often after an update you will have
-to redo your configuration starting with copying /usr/share/navit/navit.xml
+to redo your configuration starting with copying /etc/navit/navit.xml
 to ~/.navit/ and then editing it.
 
 Before you can make use of this software, you need to get maps. To see, where

diff --git a/debian/control b/debian/control
index 54268e2..09c12dc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,7 @@ Package: navit
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, navit-data (= ${source:Version})
 Recommends: gpsd
+Suggests: osm2navit
 Description: Car navigation system with routing engine
  Navit is a car navigation system with routing engine.
  .
@@ -54,3 +55,17 @@ Description: Car navigation system with routing engine - data files
  but also generates directions and even speaks to you using speech-dispatcher.
  .
  This package contains the data files for navit.
+
+Package: osm2navit
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: navit
+Description: Converts OpenStreetMap maps to Navit
+ Navit is a car navigation system with routing engine.
+ .
+ Its modular design is capable of using vector maps of various formats for
+ routing and rendering of the displayed map. It's even possible to use multiple
+ maps at a time.
+ .
+ This package contains osm2navit, a tool to convert OpenStreetMap maps to the
+ Navit format.

diff --git a/debian/navit-data.install b/debian/navit-data.install
new file mode 100644 (file)
index 0000000..8abe578
--- /dev/null
+++ b/debian/navit-data.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/navit
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale

diff --git a/debian/navit.dirs b/debian/navit.dirs
index ff24296..7188dcc 100644 (file)
--- a/debian/navit.dirs
+++ b/debian/navit.dirs
@@ -1,2 +1 @@
 etc/navit
-usr/share/doc/navit

diff --git a/debian/navit.docs b/debian/navit.docs
index 55bc0a6..11f7d7b 100644 (file)
--- a/debian/navit.docs
+++ b/debian/navit.docs
@@ -1,2 +1,3 @@
 README
 AUTHORS
+ChangeLog

diff --git a/debian/navit.install b/debian/navit.install
new file mode 100644 (file)
index 0000000..d0af6ac
--- /dev/null
+++ b/debian/navit.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/navit
+debian/tmp/usr/share/applications
+debian/tmp/usr/bin/navit

diff --git a/debian/navit.manpages b/debian/navit.manpages
index 85c5e00..0276297 100644 (file)
--- a/debian/navit.manpages
+++ b/debian/navit.manpages
@@ -1 +1 @@
-man/*
+man/navit.1

diff --git a/debian/osm2navit.install b/debian/osm2navit.install
new file mode 100644 (file)
index 0000000..269c362
--- /dev/null
+++ b/debian/osm2navit.install
@@ -0,0 +1 @@
+debian/tmp/usr/bin/osm2navit

diff --git a/debian/osm2navit.manpages b/debian/osm2navit.manpages
new file mode 100644 (file)
index 0000000..a3e6f05
--- /dev/null
+++ b/debian/osm2navit.manpages
@@ -0,0 +1 @@
+man/osm2navit.1

diff --git a/debian/rules b/debian/rules
index 25c4546..856a013 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -95,19 +95,14 @@ install: build
        dh_installdirs
 
        # Add here commands to install the package into debian/tmp.
-       $(MAKE) install DESTDIR=$(CURDIR)/debian/navit
+       $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-       mv $(CURDIR)/debian/navit/usr/share/navit/navit.xml \
+       # Default navit configuration file moved into /etc
+       mv $(CURDIR)/debian/tmp/usr/share/navit/navit.xml \
           $(CURDIR)/debian/navit/etc/navit
 
-       mv $(CURDIR)/debian/navit/usr/share/navit/README \
-          $(CURDIR)/debian/navit/usr/share/doc/navit
-
-       mkdir -p $(CURDIR)/debian/navit-data/usr/share
-       for i in navit icons locale; do \
-               mv $(CURDIR)/debian/navit/usr/share/$$i \
-                  $(CURDIR)/debian/navit-data/usr/share ;\
-       done
+       # Handled by debian/navit.docs
+       rm $(CURDIR)/debian/tmp/usr/share/navit/README
 
        dh_install