* modify navit_shipped.xml for better support of n900

diff --git a/debian/changelog b/debian/changelog
index 009341b..2b0784d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ navit (0.2.0~svn2916+dfsg.1-1maemo1) unstable; urgency=low
   * scale all gui icons
   * add selfmade navit.svg to scale the desktop icons without imagemagick
   * modify navit.desktop so it works on maemo5
+  * modify navit_shipped.xml which turns into navit.xml to better support n900
  
  -- Henning Heinold <h.heinold@tarent.de>  Mon, 21 Dec 2009 23:03:06 +0100
 

diff --git a/debian/patches/desktop_file.patch b/debian/patches/desktop_file.patch
index 0542d47..87f5529 100644 (file)
--- a/debian/patches/desktop_file.patch
+++ b/debian/patches/desktop_file.patch
@@ -1,7 +1,7 @@
 Index: navit/navit/xpm/desktop_icons/navit.desktop
 ===================================================================
---- navit.orig/navit/xpm/desktop_icons/navit.desktop   2010-01-23 14:27:40.251876205 +0100
-+++ navit/navit/xpm/desktop_icons/navit.desktop        2010-01-23 14:28:30.061461616 +0100
+--- navit.orig/navit/xpm/desktop_icons/navit.desktop   2010-01-23 14:31:06.324779308 +0100
++++ navit/navit/xpm/desktop_icons/navit.desktop        2010-01-23 20:04:46.779444054 +0100
 @@ -1,5 +1,7 @@
  [Desktop Entry]
 +Encoding=UTF-8
@@ -14,11 +14,10 @@ Index: navit/navit/xpm/desktop_icons/navit.desktop
  Comment[fr]=Le logiciel opensource de navigation vectorielle
  Exec=navit
  Icon=navit
--StartupNotify=true
 +X-Window-Icon=navit
 +X-Osso-Type=application/x-executable
 +X-Osso-Service=org.navit_project.navit
-+StartupNotify=false
+ StartupNotify=true
  Terminal=false
 -Type=Application
  Categories=GTK;Utility;Geography;

diff --git a/debian/patches/series b/debian/patches/series
index 85159fc..9448c27 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ freetype_cache.patch
 screen_unblank.patch
 desktop_icons.patch
 desktop_file.patch
+xml_config.patch

diff --git a/debian/patches/xml_config.patch b/debian/patches/xml_config.patch
new file mode 100644 (file)
index 0000000..85aae92
--- /dev/null
+++ b/debian/patches/xml_config.patch
@@ -0,0 +1,90 @@
+Index: navit/navit/navit_shipped.xml
+===================================================================
+--- navit.orig/navit/navit_shipped.xml 2010-01-23 20:22:59.647250116 +0100
++++ navit/navit/navit_shipped.xml      2010-01-23 20:30:58.252620017 +0100
+@@ -83,23 +83,48 @@
+               ]]></gui>
+               <!-- for a debug log -->
+               <log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/>
++
+               <!-- osd items allow to position display and control items directly on top of the map: -->
+-              <osd enabled="no" type="compass"/>
+               <osd enabled="no" type="eta"/> 
+               <osd enabled="no" type="navigation_distance_to_target"/> 
+               <osd enabled="no" type="navigation"/> 
+               <osd enabled="no" type="navigation_distance_to_next"/> 
+               <osd enabled="no" type="navigation_next_turn"/> 
+ 
++              <osd enabled="yes" type="compass" x="-110" y="-60" font_size="250" w="60" h="60" background_color="#000000c8"/>
++              <osd enabled="yes" type="gps_status" x="-50" y="-60" w="50" h="40" background_color="#000000c8"/>
++              <osd enabled="yes" type="text" label="${vehicle.position_sats_signal}/${vehicle.position_qual}" x="-50" y="-20"
++                                 font_size="250" w="50" h="20" align="0" background_color="#000000c8"/>
++              <osd enabled="yes" type="text" label="${vehicle.position_speed}" x="0" y="-60" font_size="400" w="110" h="60"
++                                 align="4" background_color="#000000c8"/>
++              <osd enabled="yes" type="text" label="ETA: ${navigation.item.destination_time[arrival]}" x="110" y="-30"
++                                   font_size="300" w="170" h="30" align="4" background_color="#000000c8"/>
++              <osd enabled="yes" type="text" label="${navigation.item.destination_length[named]}" x="280" y="-30"
++                                 font_size="300" w="170" h="30" align="4" background_color="#000000c8"/>
++              <osd enabled="yes" type="text" label="${navigation.item.destination_time[remaining]}" x="450" y="-30"
++                                 font_size="300" w="240" h="30" align="4" background_color="#000000c8"/>
++              <osd enabled="yes" type="text" label="In ${navigation.item[1].length[named]} " x="0" y="0" font_size="500"
++                                 w="245" h="40" align="4" background_color="#000000c8"/>
++              <osd enabled="yes" type="navigation_next_turn" x="245" y="0" font_size="500" w="60" h="40" background_color="#000000c8"
++                                 icon_src="$NAVIT_SHAREDIR/xpm/%s_wh_48_48.png" />
++              <osd enabled="yes" type="text" label="Onto ${navigation.item[1].street_name}" x="305" y="0" font_size="500"
++                                 w="495" h="40" align="4" background_color="#000000c8"/>
++              <osd enabled="yes" type="text" label="${navigation.item.street_name}" x="110" y="-60"  font_size="500"
++                                 w="580" h="30" align="0" background_color="#000000c8"/>
++
+               <!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out.
+                       Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner.
+                       It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. -->
+-              <osd enabled="no" type="button" x="0" y="0" command="gui.fullscreen()" src="toggle_fullscreen.xpm"/> 
+-              <osd enabled="no" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/>
+-              <osd enabled="no" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/>
+-              <osd enabled="no" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/> 
++              <osd enabled="yes" type="button" x="0" y="0" command="gui.fullscreen=!gui.fullscreen" src="toggle_fullscreen.xpm"/>
++              <osd enabled="yes" type="button" x="-96" y="0" command="gui.menu()" src="menu.xpm"/>
++              <osd enabled="yes" type="button" x="-96" y="-96" command="zoom_in()" src="zoom_in.xpm"/>
++              <osd enabled="yes" type="button" x="0" y="-96" command="zoom_out()" src="zoom_out.xpm"/>
++
++              <!-- allow user customize the OSD -->
++              <xi:include href="/home/user/.navit/OSD.xml"/>
+ 
+-              <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj">
++              <!-- On n900 we are using maemo vehicle -->
++              <vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="maemo">
+                       <!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): -->
+                       <log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%%i.gpx" flush_size="1000" flush_time="30"/>
+               </vehicle>
+@@ -354,8 +379,12 @@
+               <!-- Navit provides speech output in text format.
+                       If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second.
+                       The default is text output to the shell -->
+-              <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/>
++              <!-- <speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/> -->
+               <!-- <speech type="cmdline" data="flite -t '%s'"/> -->
++              <!-- on n900 espeak works pretty good, but user have to enable it, put this line with enabled="yes"
++                   into the speech.xml file -->
++              <speech type="espeak" enabled="no"/>
++                <xi:include href="/home/user/.navit/speech.xml"/>
+ 
+               <!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly -->
+               <mapset enabled="no">
+@@ -368,10 +397,15 @@
+               </mapset>
+ 
+               <!-- If you dont want to use the sample map, either set enabled="no" in the next line or remove the xml file from the maps directory -->
+-              <mapset enabled="yes">
++              <mapset enabled="no">
+                       <xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/>
+               </mapset>
+ 
++                <!-- Mapset template for userdefined maps on n900 -->
++                <mapset enabled="yes">
++                        <xi:include href="/home/user/.navit/maps.xml"/>
++                </mapset>
++
+               <!-- Mapset template for openstreetmaps -->
+               <mapset enabled="no">
+                       <map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/>