* optify my self because maemo-optify isnt that smart

* add conffiles file and remove dirs file, because the dirs
  will be already there

diff --git a/debian/conffiles b/debian/conffiles
new file mode 100644 (file)
index 0000000..0f6ba62
--- /dev/null
+++ b/debian/conffiles
@@ -0,0 +1 @@
+/etc/navit.xml

diff --git a/debian/control b/debian/control
index 7f0a65a..0c83a70 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: user/other
 Priority: extra
 Maintainer: Henning Heinold <h.heinold@tarent.de>
 XSBC-Original-Maintainer: Gilles Filippini <pini@debian.org>
-Build-Depends: debhelper (>= 5), cvs, automake1.9, libtool, quilt,
+Build-Depends: debhelper (>= 5), automake1.9, libtool, quilt,
  libdevil-dev, libhildon1-dev, libqt4-dev,
- libspeechd-dev,
+ libspeechd-dev, libespeak-dev,
  libimlib2-dev, libdbus-1-dev, libxml2-dev, libfribidi-dev, libpq-dev,
  libfreetype6-dev, libfontconfig1-dev,
  libdbus-glib-1-dev, librsvg2-bin,

diff --git a/debian/navit-data.dirs b/debian/navit-data.dirs
deleted file mode 100644 (file)
index c1da623..0000000
--- a/debian/navit-data.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/pixmaps

diff --git a/debian/navit-data.install b/debian/navit-data.install
index 8abe578..df692bd 100644 (file)
--- a/debian/navit-data.install
+++ b/debian/navit-data.install
@@ -1,3 +1,6 @@
-debian/tmp/usr/share/navit
-debian/tmp/usr/share/icons
-debian/tmp/usr/share/locale
+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/locale

diff --git a/debian/navit-graphics-gtk-drawing-area.install b/debian/navit-graphics-gtk-drawing-area.install
index 84a6fb3..3a7d324 100644 (file)
--- a/debian/navit-graphics-gtk-drawing-area.install
+++ b/debian/navit-graphics-gtk-drawing-area.install
@@ -1 +1 @@
-debian/tmp/usr/lib/navit/graphics/libgraphics_gtk_drawing_area*
+debian/tmp/opt/navit/lib/navit/graphics/libgraphics_gtk_drawing_area*.so

diff --git a/debian/navit-graphics-qt-qpainter.install b/debian/navit-graphics-qt-qpainter.install
index 84f6802..d329e4b 100644 (file)
--- a/debian/navit-graphics-qt-qpainter.install
+++ b/debian/navit-graphics-qt-qpainter.install
@@ -1 +1 @@
-debian/tmp/usr/lib/navit/graphics/libgraphics_qt_qpainter*
+debian/tmp/opt/navit/lib/navit/graphics/libgraphics_qt_qpainter*.so

diff --git a/debian/navit-gui-gtk.install b/debian/navit-gui-gtk.install
index a17a6f9..668747e 100644 (file)
--- a/debian/navit-gui-gtk.install
+++ b/debian/navit-gui-gtk.install
@@ -1 +1 @@
-debian/tmp/usr/lib/navit/gui/libgui_gtk*
+debian/tmp/opt/navit/lib/navit/gui/libgui_gtk*.so

diff --git a/debian/navit-gui-internal.install b/debian/navit-gui-internal.install
index 77a35ab..21db873 100644 (file)
--- a/debian/navit-gui-internal.install
+++ b/debian/navit-gui-internal.install
@@ -1 +1 @@
-debian/tmp/usr/lib/navit/gui/libgui_internal*
+debian/tmp/opt/navit/lib/navit/gui/libgui_internal*.so

diff --git a/debian/navit.dirs b/debian/navit.dirs
deleted file mode 100644 (file)
index 7188dcc..0000000
--- a/debian/navit.dirs
+++ /dev/null
@@ -1 +0,0 @@
-etc/navit

diff --git a/debian/navit.install b/debian/navit.install
index 1473a64..7d752ea 100644 (file)
--- a/debian/navit.install
+++ b/debian/navit.install
@@ -1,9 +1,11 @@
-debian/tmp/usr/lib/navit/map
-debian/tmp/usr/lib/navit/osd
-debian/tmp/usr/lib/navit/binding
-debian/tmp/usr/lib/navit/speech
-debian/tmp/usr/lib/navit/vehicle
-debian/tmp/usr/lib/navit/font
-debian/tmp/usr/lib/navit/graphics/libgraphics_null*
-debian/tmp/usr/share/applications
-debian/tmp/usr/bin/navit
+debian/tmp/opt/navit/lib/navit/map/*.so
+debian/tmp/opt/navit/lib/navit/osd/*.so
+debian/tmp/opt/navit/lib/navit/binding/*.so
+debian/tmp/opt/navit/lib/navit/speech/*.so
+debian/tmp/opt/navit/lib/navit/vehicle/*.so
+debian/tmp/opt/navit/lib/navit/font/*.so
+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/

diff --git a/debian/rules b/debian/rules
index 6831dc8..6c4b79d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,9 +19,12 @@ else
   DEB_CONFIGURE_EXTRA_FLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS += --prefix=/usr
+DEB_CONFIGURE_EXTRA_FLAGS += --prefix=/opt/navit
+
 # svg2png is required to display country flags
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-svg2png-scaling-flag="8 16 32"
+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"                             
 
 # Force svg2png conversion using rsvg-convert since it is the most reliable
 # ATM
@@ -67,17 +70,6 @@ endif
 post-patches::
                AUTOMAKE=automake-1.9 ACLOCAL=aclocal-1.9  autoreconf --install -I m4
 
-binary-install/navit::
-       # Remove unused .la files
-       find $(CURDIR)/debian/tmp/usr/lib/navit -name \*.la -print0 | xargs -0 rm -f
-
-       # Default navit configuration file moved into /etc
-       mv $(CURDIR)/debian/tmp/usr/share/navit/navit.xml \
-          $(CURDIR)/debian/navit/etc/navit
-
-       # Handled by debian/navit.docs
-       rm $(CURDIR)/debian/tmp/usr/share/navit/README
-
 clean::
        # Add here commands to clean up after the build process.
        [ ! -f Makefile ] || $(MAKE) distclean