Add a generated 32x32 xpm navit icon for Debian menu.

diff --git a/debian/control b/debian/control
index deb1de2..9f6ced6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,6 @@ Source: navit
 Section: misc
 Priority: extra
 Maintainer: Gilles Filippini <gilles.filippini@free.fr>
-DM-Upload-Allowed: yes
 Uploaders: Bernd Zeimetz <bzed@debian.org>
 Build-Depends: debhelper (>= 7), cvs, automake, libtool, quilt,
  libdevil-dev, libgtk2.0-dev, libhildon-1-dev,
@@ -10,7 +9,7 @@ Build-Depends: debhelper (>= 7), cvs, automake, libtool, quilt,
  libimlib2-dev, libdbus-1-dev, libxml2-dev, libfribidi-dev, libpq-dev,
  libfreetype6-dev, libfontconfig1-dev, ttf-liberation, python-dev,
  libsdl-image1.2-dev, mdbtools-dev, libdbus-glib-1-dev, libqt4-dev,
- librsvg2-bin, libgarmin-dev
+ librsvg2-bin, libgarmin-dev, imagemagick
 Standards-Version: 3.8.1
 Homepage: http://navit.sourceforge.net/
 Vcs-Browser: http://git.debian.org/?p=collab-maint/navit.git;a=summary

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

diff --git a/debian/navit.menu b/debian/navit.menu
index abd0acf..f9fafc3 100644 (file)
--- a/debian/navit.menu
+++ b/debian/navit.menu
@@ -1,2 +1,2 @@
 ?package(navit):needs="X11" section="Applications/Science/Geoscience"\
-  title="navit" command="/usr/bin/navit"
+  title="navit" command="/usr/bin/navit" icon=navit

diff --git a/debian/rules b/debian/rules
index 1921ab0..f86a57f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -111,6 +111,9 @@ install: build
        # Handled by debian/navit.docs
        rm $(CURDIR)/debian/tmp/usr/share/navit/README
 
+       # Generate icon for Debian menu
+       convert $(CURDIR)/navit/xpm/desktop_icons/128x128/navit.png -resize 32x32 $(CURDIR)/debian/navit-data/usr/share/pixmaps/navit.xpm
+
        dh_install
 
 # Build architecture-independent files here.