Remove patch clean_pngs: applied upstream.

diff --git a/debian/patches/clean_pngs b/debian/patches/clean_pngs
deleted file mode 100644 (file)
index e1b364d..0000000
--- a/debian/patches/clean_pngs
+++ /dev/null
@@ -1,42 +0,0 @@
-Removes generated png files during distclean-local so that
-the package can afford two builds in a row.
-Index: navit/navit/xpm/Makefile.am
-===================================================================
---- navit.orig/navit/xpm/Makefile.am   2009-03-01 22:24:47.000000000 +0100
-+++ navit/navit/xpm/Makefile.am        2009-03-01 22:34:12.000000000 +0100
-@@ -183,20 +183,21 @@
- if USE_SVG2PNG
- %.png:$(srcdir)/*.svg
-       SRCDIR=$(srcdir) $(srcdir)/navit_svg2png "@SVG2PNG@" "$@"
--xpm_DATA += $(addsuffix .png,$(basename $(svgs)))
-+pngs = $(addsuffix .png,$(basename $(svgs)))
- xsize=$(firstword $(subst x, ,$(scale)))
- ysize=$(lastword $(subst x, ,$(scale)))
- comma=,
- if USE_SVG2PNG_SCALES
--xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs))))
-+pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(svgs))))
- endif
- if USE_SVG2PNG_SCALES_FLAG
--xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
-+pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_FLAG@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(flag_svgs))))
- endif
- if USE_SVG2PNG_SCALES_NAV
--xpm_DATA += $(addsuffix .png,$(basename $(nav_svgs)))
--xpm_DATA += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs))))
-+pngs += $(addsuffix .png,$(basename $(nav_svgs)))
-+pngs += $(foreach scale, $(subst $(comma), ,@SVG2PNG_SCALES_NAV@), $(addsuffix _$(xsize)_$(ysize).png,$(basename $(nav_svgs))))
- endif
-+xpm_DATA += $(pngs)
- endif
- 
- DESKTOPFILEdir=$(datadir)/applications
-@@ -211,3 +212,8 @@
- EXTRA_DIST = $(xpm_DATA) $(DESKTOPFILE_DATA) $(ICON128_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)
-+endif

diff --git a/debian/patches/series b/debian/patches/series
index 6f749f3..a7180ee 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 moc_location
 mg-alignment
 endianness
-clean_pngs
 remove-ttf-liberation
 remove-glib
 remove-mini-libc