projects / navit-package / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2aefaff)
* next bunch of updates unreleased now at svn rev 2947
authorHenning Heinold <heinold@inf.fu-berlin.de>
Fri, 5 Feb 2010 00:07:12 +0000 (01:07 +0100)
committerHenning Heinold <heinold@inf.fu-berlin.de>
Fri, 5 Feb 2010 00:09:30 +0000 (01:09 +0100)
debian/changelog patch | blob | history
debian/patches/desktop_icons.patch patch | blob | history
debian/patches/mg-unhandled-attr [deleted file] patch | blob | history
debian/patches/screen_unblank.patch patch | blob | history
debian/patches/series patch | blob | history

diff --git a/debian/changelog b/debian/changelog
index f439d30..2a89275 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-navit (0.2.0~svn2931+dfsg.1-1maemo1) unstable; urgency=low
+navit (0.2.0~svn2947+dfsg.1-1maemo1) unstable; urgency=low
  
   * new svn version
   * libgps fix was apllied upsream
+  * mg-unhandled-attr.patch was apllied upstream
   * new memleak fixes patch
-  * don't make all png, except the system icons
+  * don't make any png, except the system icons
   * modfied internal gui and OSD looks like on n810
  
- -- Henning Heinold <h.heinold@tarent.de>  Thu, 28 Jan 2010 11:43:56 +0100
+ -- Henning Heinold <h.heinold@tarent.de>  Fri, 05 Feb 2010 01:06:46 +0100
 
 navit (0.2.0~svn2916+dfsg.1-1maemo1) unstable; urgency=low
  
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
diff --git a/debian/patches/mg-unhandled-attr b/debian/patches/mg-unhandled-attr
deleted file mode 100644 (file)
index b058949..0000000
--- a/debian/patches/mg-unhandled-attr
+++ /dev/null
@@ -1,15 +0,0 @@
-Workaround for unhandled attrs in MG
-Index: navit/navit/map/mg/town.c
-===================================================================
---- navit.orig/navit/map/mg/town.c     2010-01-28 11:24:04.764555911 +0100
-+++ navit/navit/map/mg/town.c  2010-01-28 11:24:47.414141125 +0100
-@@ -105,7 +105,8 @@
-               twn->attr_next=attr_none;
-               return 1;
-       default:
--              dbg_assert(1==0);
-+                dbg(1, "Don't know about attribute %d[%04X]=%s yet\n",
-+                      attr_type, attr_type, attr_to_name(attr_type));
-               return 0;
-       }
-       return 1;
diff --git a/debian/patches/screen_unblank.patch b/debian/patches/screen_unblank.patch
index 93f1ce1..f17667d 100644 (file)
--- a/debian/patches/screen_unblank.patch
+++ b/debian/patches/screen_unblank.patch
@@ -1,7 +1,7 @@
 Index: navit/configure.in
 ===================================================================
---- navit.orig/configure.in    2010-01-28 11:24:54.500388740 +0100
-+++ navit/configure.in 2010-01-28 11:25:00.401640057 +0100
+--- navit.orig/configure.in    2010-02-05 00:57:22.000000000 +0100
++++ navit/configure.in 2010-02-05 00:58:19.127738212 +0100
 @@ -211,6 +211,13 @@
                ], [
                AC_MSG_RESULT(no)
@@ -18,8 +18,8 @@ Index: navit/configure.in
                AC_SUBST(HILDON_CFLAGS)
 Index: navit/navit/Makefile.am
 ===================================================================
---- navit.orig/navit/Makefile.am       2010-01-28 11:24:42.078308401 +0100
-+++ navit/navit/Makefile.am    2010-01-28 11:25:00.401640057 +0100
+--- navit.orig/navit/Makefile.am       2010-02-05 00:57:22.000000000 +0100
++++ navit/navit/Makefile.am    2010-02-05 00:58:19.148160706 +0100
 @@ -18,7 +18,7 @@
  endif
  
@@ -40,8 +40,8 @@ Index: navit/navit/Makefile.am
  
 Index: navit/navit/attr_def.h
 ===================================================================
---- navit.orig/navit/attr_def.h        2010-01-28 11:24:04.621222786 +0100
-+++ navit/navit/attr_def.h     2010-01-28 11:25:00.401640057 +0100
+--- navit.orig/navit/attr_def.h        2010-02-05 00:55:56.000000000 +0100
++++ navit/navit/attr_def.h     2010-02-05 00:58:19.150834975 +0100
 @@ -274,6 +274,7 @@
  ATTR(filter)
  ATTR(daylayout)
@@ -52,8 +52,8 @@ Index: navit/navit/attr_def.h
  ATTR(user_name)
 Index: navit/navit/gui/internal/gui_internal.c
 ===================================================================
---- navit.orig/navit/gui/internal/gui_internal.c       2010-01-28 11:24:04.627889542 +0100
-+++ navit/navit/gui/internal/gui_internal.c    2010-01-28 11:25:00.404973203 +0100
+--- navit.orig/navit/gui/internal/gui_internal.c       2010-02-05 00:46:35.000000000 +0100
++++ navit/navit/gui/internal/gui_internal.c    2010-02-05 00:58:19.150834975 +0100
 @@ -4369,6 +4369,9 @@
                        graphics_draw_mode(this->gra, draw_mode_end);
                        this->win->fullscreen(this->win, attr->u.num > 0);
@@ -66,8 +66,8 @@ Index: navit/navit/gui/internal/gui_internal.c
                return 1;
 Index: navit/navit/navit.h
 ===================================================================
---- navit.orig/navit/navit.h   2010-01-28 11:24:04.634556515 +0100
-+++ navit/navit/navit.h        2010-01-28 11:25:00.404973203 +0100
+--- navit.orig/navit/navit.h   2010-02-05 00:41:18.000000000 +0100
++++ navit/navit/navit.h        2010-02-05 00:58:19.150834975 +0100
 @@ -61,6 +61,10 @@
  void navit_ignore_graphics_events(struct navit *this_, int ignore);
  int navit_handle_button(struct navit *this_, int pressed, int button, struct point *p, struct callback *popup_callback);
@@ -81,24 +81,25 @@ Index: navit/navit/navit.h
  struct navit *navit_new(struct attr *parent, struct attr **attrs);
 Index: navit/navit/xpm/Makefile.am
 ===================================================================
---- navit.orig/navit/xpm/Makefile.am   2010-01-28 11:24:04.641222748 +0100
-+++ navit/navit/xpm/Makefile.am        2010-01-28 11:25:00.404973203 +0100
-@@ -207,7 +207,11 @@
- endif
+--- navit.orig/navit/xpm/Makefile.am   2010-02-05 00:55:56.000000000 +0100
++++ navit/navit/xpm/Makefile.am        2010-02-05 00:59:52.957318625 +0100
+@@ -214,7 +214,12 @@
  
- DESKTOPFILEdir=$(datadir)/applications
+ if !SUPPORT_WIN32
+   DESKTOPFILEdir=$(datadir)/applications
++
 +if USE_HILDON
-+DESKTOPFILE_DATA = desktop_icons/navit.desktop, desktop_icons/org.navit-project.Navit.service
++  DESKTOPFILE_DATA = desktop_icons/navit.desktop, desktop_icons/org.navit-project.Navit.service
 +else
- DESKTOPFILE_DATA = desktop_icons/navit.desktop
+   DESKTOPFILE_DATA = desktop_icons/navit.desktop
 +endif
  
- ICON128dir=$(datadir)/icons/hicolor/128x128/apps
- ICON128_DATA = desktop_icons/128x128/navit.png
+   ICON128dir=$(datadir)/icons/hicolor/128x128/apps
+   ICON128_DATA = desktop_icons/128x128/navit.png
 Index: navit/navit/navit.c
 ===================================================================
---- navit.orig/navit/navit.c   2010-01-28 11:24:04.647889371 +0100
-+++ navit/navit/navit.c        2010-01-28 11:25:00.404973203 +0100
+--- navit.orig/navit/navit.c   2010-02-05 00:46:22.368648992 +0100
++++ navit/navit/navit.c        2010-02-05 00:58:19.150834975 +0100
 @@ -61,7 +61,9 @@
  #include "messages.h"
  #include "vehicleprofile.h"
diff --git a/debian/patches/series b/debian/patches/series
index 580f33f..21a3b46 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@ remove-libpng
 remove-espeak
 remove-support
 no-default-poi-geodownload
-mg-unhandled-attr
 revert-part-of-svn2859
 autotools.patch
 freetype_cache.patch
Unnamed repository; edit this file to name it for gitweb.