* Dropped graphic drivers gd and sdl since they are currently broken at run

  time
* One package per gui and graphic driver plugin

diff --git a/debian/README.Debian b/debian/README.Debian
index a7558a2..450b1e1 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -3,7 +3,9 @@ navit for Debian
 
 Navit is a young and volatile software. Often after an update you will have
 to redo your configuration starting with copying /etc/navit/navit.xml
-to ~/.navit/ and then editing it.
+to ~/.navit/ and then editing it. Pease have a look at the Configuring Navit
+wiki page at:
+http://wiki.navit-project.org/index.php/Configuring_Navit
 
 Before you can make use of this software, you need to get maps. To see, where
 you can get maps for navit, see:

diff --git a/debian/README.source b/debian/README.source
index 26d3562..e014f5f 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -144,7 +144,8 @@ this command.
 3- TO-DO
 ========
 
-* fix code alignment in marco-polo stuff (in progress)
+* fix code alignment in marco-polo stuff (work in progress):
+  <http://trac.navit-project.org/ticket/272>
 * fix endianness in navit/data.h:get_*
 * consider packaging gui plugins separately
 * same goes for map plugins
@@ -157,6 +158,8 @@ this command.
 * --enable-gui-clutter as soon as gui_clutter_main.c compiles again
 * --enable-gui-sdl as soon as cegui supports SILLY
   (check libCEGUISILLYImageCodec)
+* --enable-graphics-gd: currently broken + unclear status
+* --enable-graphics-sdl: currently broken
 * add Depends: python2.5-dev as soon as python support isn't broken anymore
   in configure.
 

diff --git a/debian/control b/debian/control
index 3954297..d1403e4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: misc
 Priority: extra
 Maintainer: Gilles Filippini <gilles.filippini@free.fr>
 Build-Depends: debhelper (>= 7), cvs, automake, libtool, quilt,
- libdevil-dev, libgtk2.0-dev, libsdl1.2-dev, libhildon-1-dev,
+ libdevil-dev, libgtk2.0-dev, libhildon-1-dev,
  libglc-dev (>= 0.7.1), libspeechd-dev, libgps-dev (>= 2.37), glutg3-dev,
  libimlib2-dev, libdbus-1-dev, libxml2-dev, libfribidi-dev, libpq-dev,
- libfreetype6-dev, libfontconfig1-dev, ttf-liberation, libgd2-xpm-dev,
+ libfreetype6-dev, libfontconfig1-dev, ttf-liberation,
  libsdl-image1.2-dev, mdbtools-dev, libdbus-glib-1-dev, libqt4-dev,
  librsvg2-bin | inkscape | kdebase-runtime | kdelibs4-dev
 Standards-Version: 3.8.0
@@ -16,7 +16,9 @@ Vcs-Git: git://git.debian.org/git/collab-maint/navit.git
 
 Package: navit
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, navit-data (= ${source:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, navit-data (= ${source:Version}),
+ navit-gui-internal (= ${source:Version}) |
+ navit-gui-gtk (= ${source:Version})
 Recommends: gpsd
 Suggests: osm2navit
 Description: Car navigation system with routing engine
@@ -35,6 +37,97 @@ Description: Car navigation system with routing engine
  The routing engine not only calculates an optimal route to your destination,
  but also generates directions and even speaks to you using speech-dispatcher.
 
+Package: navit-gui-gtk
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, navit (= ${source:Version}),
+ navit-graphic-gtk-drawing-area (= ${source:Version})
+Description: Car navigation system with routing engine - GTK+ GUI
+ 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.
+ .
+ The GTK+ or SDL user interfaces are designed to work well with touch screen
+ displays. Points of Interest of various formats are displayed on the map.
+ .
+ The current vehicle position is either read from gpsd or directly from NMEA
+ GPS sensors.
+ .
+ The routing engine not only calculates an optimal route to your destination,
+ but also generates directions and even speaks to you using speech-dispatcher.
+ .
+ This package contains the GTK+ GUI plugin.
+
+Package: navit-gui-internal
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, navit (= ${source:Version}),
+ navit-graphic-gtk-drawing-area (= ${source:Version}) |
+ navit-graphic-qt-qpainter (= ${source:Version}) |
+ navit-graphic-sdl (= ${source:Version}) |
+ navit-graphic-gd (= ${source:Version}) |
+Description: Car navigation system with routing engine - internal GUI
+ 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.
+ .
+ The GTK+ or SDL user interfaces are designed to work well with touch screen
+ displays. Points of Interest of various formats are displayed on the map.
+ .
+ The current vehicle position is either read from gpsd or directly from NMEA
+ GPS sensors.
+ .
+ The routing engine not only calculates an optimal route to your destination,
+ but also generates directions and even speaks to you using speech-dispatcher.
+ .
+ This package contains the internal GUI plugin.
+
+Package: navit-graphic-gtk-drawing-area
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, navit (= ${source:Version})
+Description: Car navigation system with routing engine - GTK+ graphic plugin
+ 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.
+ .
+ The GTK+ or SDL user interfaces are designed to work well with touch screen
+ displays. Points of Interest of various formats are displayed on the map.
+ .
+ The current vehicle position is either read from gpsd or directly from NMEA
+ GPS sensors.
+ .
+ The routing engine not only calculates an optimal route to your destination,
+ but also generates directions and even speaks to you using speech-dispatcher.
+ .
+ This package contains the graphic gtk-drawing-area plugin to use with GTK+
+ aware GUIs plugins.
+
+Package: navit-graphic-qt-qpainter
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, navit (= ${source:Version})
+Description: Car navigation system with routing engine - QT graphic plugin
+ 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.
+ .
+ The GTK+ or SDL user interfaces are designed to work well with touch screen
+ displays. Points of Interest of various formats are displayed on the map.
+ .
+ The current vehicle position is either read from gpsd or directly from NMEA
+ GPS sensors.
+ .
+ The routing engine not only calculates an optimal route to your destination,
+ but also generates directions and even speaks to you using speech-dispatcher.
+ .
+ This package contains the graphic qt-qpainter plugin to use with QT aware GUIs
+ plugins.
+
 Package: navit-data
 Architecture: all
 Recommends: navit

diff --git a/debian/navit-graphic-gtk-drawing-area.install b/debian/navit-graphic-gtk-drawing-area.install
new file mode 100644 (file)
index 0000000..84a6fb3
--- /dev/null
+++ b/debian/navit-graphic-gtk-drawing-area.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/navit/graphics/libgraphics_gtk_drawing_area*

diff --git a/debian/navit-graphic-qt-qpainter.install b/debian/navit-graphic-qt-qpainter.install
new file mode 100644 (file)
index 0000000..84f6802
--- /dev/null
+++ b/debian/navit-graphic-qt-qpainter.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/navit/graphics/libgraphics_qt_qpainter*

diff --git a/debian/navit-gui-gtk.install b/debian/navit-gui-gtk.install
new file mode 100644 (file)
index 0000000..a17a6f9
--- /dev/null
+++ b/debian/navit-gui-gtk.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/navit/gui/libgui_gtk*

diff --git a/debian/navit-gui-internal.install b/debian/navit-gui-internal.install
new file mode 100644 (file)
index 0000000..77a35ab
--- /dev/null
+++ b/debian/navit-gui-internal.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/navit/gui/libgui_internal*

diff --git a/debian/navit.install b/debian/navit.install
index d0af6ac..1473a64 100644 (file)
--- a/debian/navit.install
+++ b/debian/navit.install
@@ -1,3 +1,9 @@
-debian/tmp/usr/lib/navit
+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

diff --git a/debian/rules b/debian/rules
index 856a013..1e856a6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,15 +21,17 @@ CONFFLAGS += --enable-svg2png-scaling-flag="8 16 32 48 96"
 
 # Enable GUIs we want
 CONFFLAGS += --enable-gui-gtk --enable-gui-internal \
-       --enable-hildon --enable-graphics-gd
+       --enable-hildon
 
 # Broken switches
 # clutter (build fails)
 # sdl (missing libCEGUISILLYImageCodec)
 # directfb (build fails)
+# gd (run fails)
 # python (configure fails while python2.5-dev is there)
 CONFFLAGS += --disable-gui-clutter --disable-gui-sdl \
-        --disable-directfb --disable-binding-python
+        --disable-directfb --disable-binding-python --disable-graphics-gd \
+       --disable-graphics-sdl
 
 # don't build the samplemap - we don't want to download
 # stuff while building...