* better adjust the install dirs

diff --git a/debian/navit-data.install b/debian/navit-data.install
index df692bd..9481938 100644 (file)
--- a/debian/navit-data.install
+++ b/debian/navit-data.install
@@ -1,6 +1,3 @@
-debian/tmp/opt/navit/share/icons/hicolor/128x128/apps/navit.png /usr/share/icons/hicolor/128x128/apps/navit.png
-debian/tmp/opt/navit/share/icons/hicolor/64x64/apps/navit.png /usr/share/icons/hicolor/64x64/apps/navit.png
-debian/tmp/opt/navit/share/icons/hicolor/48x48/apps/navit.png /usr/share/icons/hicolor/48x48/apps/navit.png
-debian/tmp/opt/navit/share/navit
-debian/tmp/opt/navit/share/icons
+debian/tmp/opt/navit/share/icons/ /usr/share/icons/
 debian/tmp/opt/navit/share/locale
+ebian/tmp/opt/navit/share/navit/xpm

diff --git a/debian/navit.install b/debian/navit.install
index 7d752ea..c2282f6 100644 (file)
--- a/debian/navit.install
+++ b/debian/navit.install
@@ -8,4 +8,4 @@ debian/tmp/opt/navit/lib/navit/graphics/libgraphics_null*.so
 debian/tmp/opt/navit/share/applications/navit.desktop /usr/share/applications/hildon
 debian/tmp/opt/navit/share/applications/org.navit-project.Navit.service /usr/share/dbus-1/services
 debian/tmp/opt/navit/bin/navit
-debian/tmp/opt/navit/share/navit/navit.xml /etc/navit/
+/etc/navit/

diff --git a/debian/rules b/debian/rules
index 6c4b79d..46cae35 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,10 +19,11 @@ else
   DEB_CONFIGURE_EXTRA_FLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS += --prefix=/opt/navit
+DEB_CONFIGURE_EXTRA_FLAGS += --prefix=/opt/navit \
+                             --sysconfdir=/etc
 
 # svg2png is required to display country flags
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-svg2png-scaling="32,48,64" \
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-svg2png-scaling="32 48,64" \
                              --enable-svg2png-scaling-flag="8,16,32" \
                              --enable-svg2png-scaling-nav="8,16,32,48,64"