[Pkg-gtkpod-devel] r278 - gtkpod/trunk/debian/patches

[nion at alioth.debian.org]

Author: nion
Date: 2007-11-20 13:21:27 +0000 (Tue, 20 Nov 2007)
New Revision: 278

Modified:
   gtkpod/trunk/debian/patches/01_mountpoint.dpatch
Log:
add missing changes to prefs.c


Modified: gtkpod/trunk/debian/patches/01_mountpoint.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/01_mountpoint.dpatch	2007-11-19 18:11:55 UTC (rev 277)
+++ gtkpod/trunk/debian/patches/01_mountpoint.dpatch	2007-11-20 13:21:27 UTC (rev 278)
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad trunk~/README trunk/README
 --- trunk~/README	2007-11-18 16:47:22.000000000 +0100
-+++ trunk/README	2007-11-18 16:48:21.000000000 +0100
++++ trunk/README	2007-11-20 14:20:36.000000000 +0100
 @@ -52,7 +52,7 @@
  1) If your iPod is not mounted automatically when connecting it to
     your computer follow steps 1-7 in the "Connecting your iPod to a
@@ -156,7 +156,7 @@
  
 diff -urNad trunk~/scripts/sync-abook.sh trunk/scripts/sync-abook.sh
 --- trunk~/scripts/sync-abook.sh	2007-11-18 16:28:19.000000000 +0100
-+++ trunk/scripts/sync-abook.sh	2007-11-18 16:48:16.000000000 +0100
++++ trunk/scripts/sync-abook.sh	2007-11-20 14:20:36.000000000 +0100
 @@ -9,7 +9,7 @@
  #
  # with the following defaults: 
@@ -168,7 +168,7 @@
  ENCODING=ISO-8859-15                            # encoding used by ipod
 diff -urNad trunk~/scripts/sync-evocalendar.sh trunk/scripts/sync-evocalendar.sh
 --- trunk~/scripts/sync-evocalendar.sh	2007-11-18 16:28:23.000000000 +0100
-+++ trunk/scripts/sync-evocalendar.sh	2007-11-18 16:48:16.000000000 +0100
++++ trunk/scripts/sync-evocalendar.sh	2007-11-20 14:20:36.000000000 +0100
 @@ -10,7 +10,7 @@
  #
  # with the following defaults: 
@@ -180,7 +180,7 @@
  #FILTER_SCRIPT=
 diff -urNad trunk~/scripts/sync-evolution.sh trunk/scripts/sync-evolution.sh
 --- trunk~/scripts/sync-evolution.sh	2007-11-18 16:28:26.000000000 +0100
-+++ trunk/scripts/sync-evolution.sh	2007-11-18 16:48:16.000000000 +0100
++++ trunk/scripts/sync-evolution.sh	2007-11-20 14:20:36.000000000 +0100
 @@ -13,7 +13,7 @@
  #
  # with the following defaults: 
@@ -192,7 +192,7 @@
  
 diff -urNad trunk~/scripts/sync-kaddressbook.sh trunk/scripts/sync-kaddressbook.sh
 --- trunk~/scripts/sync-kaddressbook.sh	2007-11-18 16:28:29.000000000 +0100
-+++ trunk/scripts/sync-kaddressbook.sh	2007-11-18 16:48:16.000000000 +0100
++++ trunk/scripts/sync-kaddressbook.sh	2007-11-20 14:20:36.000000000 +0100
 @@ -9,7 +9,7 @@
  #
  # with the following defaults: 
@@ -204,7 +204,7 @@
  
 diff -urNad trunk~/scripts/sync-korganizer.sh trunk/scripts/sync-korganizer.sh
 --- trunk~/scripts/sync-korganizer.sh	2007-11-18 16:28:35.000000000 +0100
-+++ trunk/scripts/sync-korganizer.sh	2007-11-18 16:48:16.000000000 +0100
++++ trunk/scripts/sync-korganizer.sh	2007-11-20 14:20:36.000000000 +0100
 @@ -9,7 +9,7 @@
  #
  # with the following defaults: 
@@ -215,8 +215,8 @@
  ENCODING=ISO-8859-15                          # encoding used by ipod
  
 diff -urNad trunk~/scripts/sync-ldif.sh trunk/scripts/sync-ldif.sh
---- trunk~/scripts/sync-ldif.sh	2007-11-18 16:28:40.000000000 +0100
-+++ trunk/scripts/sync-ldif.sh	2007-11-18 16:48:16.000000000 +0100
+--- trunk~/scripts/sync-ldif.sh	2007-11-19 18:49:28.000000000 +0100
++++ trunk/scripts/sync-ldif.sh	2007-11-20 14:20:36.000000000 +0100
 @@ -15,7 +15,7 @@
  # differently...This is still Chinese for me!! :)
  
@@ -228,7 +228,7 @@
  declare DELETE="NO"			# To delete old .vcf files by default? 'NO'!!
 diff -urNad trunk~/scripts/sync-thunderbird-nano.sh trunk/scripts/sync-thunderbird-nano.sh
 --- trunk~/scripts/sync-thunderbird-nano.sh	2007-11-18 16:28:43.000000000 +0100
-+++ trunk/scripts/sync-thunderbird-nano.sh	2007-11-18 16:48:16.000000000 +0100
++++ trunk/scripts/sync-thunderbird-nano.sh	2007-11-20 14:20:36.000000000 +0100
 @@ -25,7 +25,7 @@
  
  # with the following defaults: 
@@ -240,7 +240,7 @@
  FILE_FLAG=''		     # flag used to determine end of file
 diff -urNad trunk~/scripts/sync-thunderbird.sh trunk/scripts/sync-thunderbird.sh
 --- trunk~/scripts/sync-thunderbird.sh	2007-11-18 16:28:46.000000000 +0100
-+++ trunk/scripts/sync-thunderbird.sh	2007-11-18 16:48:16.000000000 +0100
++++ trunk/scripts/sync-thunderbird.sh	2007-11-20 14:20:36.000000000 +0100
 @@ -18,7 +18,7 @@
  
  # with the following defaults: 
@@ -252,7 +252,7 @@
  
 diff -urNad trunk~/scripts/sync-webcalendar.sh trunk/scripts/sync-webcalendar.sh
 --- trunk~/scripts/sync-webcalendar.sh	2007-11-18 16:28:52.000000000 +0100
-+++ trunk/scripts/sync-webcalendar.sh	2007-11-18 16:48:16.000000000 +0100
++++ trunk/scripts/sync-webcalendar.sh	2007-11-20 14:20:36.000000000 +0100
 @@ -9,7 +9,7 @@
  # with the following defaults:
  
@@ -262,3 +262,15 @@
  # uri for webcalendar (example)
  DATAFILE='https://somewhere.local/calendar.ics'
  # calendar name
+diff -urNad trunk~/src/prefs.c trunk/src/prefs.c
+--- trunk~/src/prefs.c	2007-11-18 16:45:09.000000000 +0100
++++ trunk/src/prefs.c	2007-11-20 14:20:44.000000000 +0100
+@@ -178,7 +178,7 @@
+     prefs_set_int("delete_file", TRUE);
+     prefs_set_int("delete_local_file", TRUE);
+     prefs_set_int("delete_database", TRUE);
+-    prefs_set_string("initial_mountpoint", "/mnt/ipod");
++    prefs_set_string("initial_mountpoint", "/media/ipod");
+     prefs_set_string ("path_play_now", "xmms %s");
+     prefs_set_string ("path_play_enqueue", "xmms -e %s");
+     prefs_set_string ("path_mserv_trackinfo_root", "/var/lib/mserv/trackinfo/");