* fix scaling of desktop icons

diff --git a/debian/patches/desktop_icons.patch b/debian/patches/desktop_icons.patch
index 5d36b82..cc3dcb4 100644 (file)
--- a/debian/patches/desktop_icons.patch
+++ b/debian/patches/desktop_icons.patch
@@ -1,7 +1,7 @@
 Index: navit/navit/xpm/desktop_icons/navit.svg
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ navit/navit/xpm/desktop_icons/navit.svg    2010-01-23 01:37:23.876049444 +0100
++++ navit/navit/xpm/desktop_icons/navit.svg    2010-01-23 02:09:14.398774920 +0100
 @@ -0,0 +1,68 @@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -73,27 +73,41 @@ Index: navit/navit/xpm/desktop_icons/navit.svg
 +</svg>
 Index: navit/navit/xpm/Makefile.am
 ===================================================================
---- navit.orig/navit/xpm/Makefile.am   2010-01-23 01:37:23.866049569 +0100
-+++ navit/navit/xpm/Makefile.am        2010-01-23 01:38:00.608968339 +0100
-@@ -188,6 +188,11 @@
+--- navit.orig/navit/xpm/Makefile.am   2010-01-23 02:09:14.388780937 +0100
++++ navit/navit/xpm/Makefile.am        2010-01-23 02:10:29.838354024 +0100
+@@ -188,6 +188,12 @@
        SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
  %.png:$(srcdir)/*.svg
        SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
-+%.png:$(srcdir)/desktop_icons/navit.svg
-+      -install -d desktop_icons/64x64/
++desktop_icons/48x48/navit.png:
 +      -install -d desktop_icons/48x48/
-+      SRCDIR=$(srcdir)/desktop_icons/64x64 $(srcdir)/navit_svg2png "$@"
-+      SRCDIR=$(srcdir)/desktop_icons/48x48 $(srcdir)/navit_svg2png "$@"
++      rsvg-convert -w 48 -h 48 -f png -o desktop_icons/48x48/navit.png desktop_icons/navit.svg
++desktop_icons/64x64/navit.png:
++      -install -d desktop_icons/64x64/
++      rsvg-convert -w 48 -h 48 -f png -o desktop_icons/48x48/navit.png desktop_icons/navit.svg
  pngs = $(addsuffix .png,$(basename $(svgs)))
  xsize=$(word 1,$(subst x, ,$(scale)))
  ysize=$(word $(words $(scale)),$(subst x, ,$(scale)))
-@@ -214,6 +219,9 @@
+@@ -214,14 +220,21 @@
  ICON128dir=$(datadir)/icons/hicolor/128x128/apps
  ICON128_DATA = desktop_icons/128x128/navit.png
  
 +ICON64dir=$(datadir)/icons/hicolor/64x64/apps
 +ICON64_DATA = desktop_icons/64x64/navit.png
 +
++ICON48dir=$(datadir)/icons/hicolor/48x48/apps
++ICON48_DATA = desktop_icons/48x48/navit.png
++
  ICON22dir=$(datadir)/icons/hicolor/22x22/apps
  ICON22_DATA = desktop_icons/22x22/navit.png
  
+-EXTRA_DIST = $(xpm_DATA) $(DESKTOPFILE_DATA) $(ICON128_DATA) $(ICON22_DATA) navit_svg2png
++EXTRA_DIST = $(xpm_DATA) $(DESKTOPFILE_DATA) $(ICON128_DATA) $(ICON64_DATA) $(ICON48_DATA) $(ICON22_DATA) navit_svg2png
+ #burgerking.ico:
+ #     wget http://www.burgerking.de/favicon.ico -O burgerking.ico
+ 
+ if USE_SVG2PNG
+ distclean-local:
+       rm -f $(pngs)
++      rm -rf desktop_icons/48x48/ desktop_icons/64x64/
+ endif