* next bunch of updates unreleased now at svn rev 2947

[navit-package] / debian / patches / desktop_icons.patch

diff --git a/debian/patches/desktop_icons.patch b/debian/patches/desktop_icons.patch
index 6ebf40e..837d6e2 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-31 01:49:26.259775002 +0100
++++ navit/navit/xpm/desktop_icons/navit.svg    2010-02-05 01:00:16.237726520 +0100
 @@ -0,0 +1,68 @@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -73,9 +73,9 @@ Index: navit/navit/xpm/desktop_icons/navit.svg
 +</svg>
 Index: navit/navit/xpm/Makefile.am
 ===================================================================
---- navit.orig/navit/xpm/Makefile.am   2010-01-31 01:49:26.253113406 +0100
-+++ navit/navit/xpm/Makefile.am        2010-01-31 01:49:51.828945268 +0100
-@@ -184,26 +184,12 @@
+--- navit.orig/navit/xpm/Makefile.am   2010-02-05 01:00:09.000000000 +0100
++++ navit/navit/xpm/Makefile.am        2010-02-05 01:04:44.457284023 +0100
+@@ -187,29 +187,12 @@
  endif
  
  if USE_SVG2PNG
@@ -89,12 +89,15 @@ Index: navit/navit/xpm/Makefile.am
 -ysize = $(word $(words $(scale)),$(subst x, ,$(scale)))
 -comma =,
 -
+-# png images of the user interface and other, sizes e.g. "8,16,32,48,96"
 -if USE_SVG2PNG_SCALES
 -pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs))))
 -endif
+-# png state flags
 -if USE_SVG2PNG_SCALES_FLAG
 -pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
 -endif
+-# png symbols for navigation
 -if USE_SVG2PNG_SCALES_NAV
 -pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs))))
 -endif
@@ -107,19 +110,20 @@ Index: navit/navit/xpm/Makefile.am
 +      rsvg-convert -w 64 -h 64 -f png -o desktop_icons/64x64/navit.png desktop_icons/navit.svg
  endif
  
- DESKTOPFILEdir=$(datadir)/applications
-@@ -216,14 +202,21 @@
- ICON128dir=$(datadir)/icons/hicolor/128x128/apps
- ICON128_DATA = desktop_icons/128x128/navit.png
+ if !SUPPORT_WIN32
+@@ -224,15 +207,22 @@
+   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
++  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
++  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
+   ICON22dir=$(datadir)/icons/hicolor/22x22/apps
+   ICON22_DATA = desktop_icons/22x22/navit.png
+ endif
  
 -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
@@ -128,6 +132,7 @@ Index: navit/navit/xpm/Makefile.am
  
  if USE_SVG2PNG
  distclean-local:
-       rm -f $(pngs)
+-      rm -f $(pngs)
++      -rm -f $(pngs)
 +      rm -rf desktop_icons/48x48/ desktop_icons/64x64/
  endif