[Pkg-gtkpod-devel] r270 - gtkpod/trunk/debian/patches
nion at alioth.debian.org
nion at alioth.debian.org
Sun Nov 18 15:50:52 UTC 2007
Author: nion
Date: 2007-11-18 15:50:52 +0000 (Sun, 18 Nov 2007)
New Revision: 270
Modified:
gtkpod/trunk/debian/patches/01_mountpoint.dpatch
Log:
updated mointpoint patch
Modified: gtkpod/trunk/debian/patches/01_mountpoint.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/01_mountpoint.dpatch 2007-11-18 15:47:05 UTC (rev 269)
+++ gtkpod/trunk/debian/patches/01_mountpoint.dpatch 2007-11-18 15:50:52 UTC (rev 270)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad gtkpod-0.99.10~/README gtkpod-0.99.10/README
---- gtkpod-0.99.10~/README 2007-06-27 21:29:36.000000000 +0200
-+++ gtkpod-0.99.10/README 2007-11-18 14:02:44.000000000 +0100
+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
@@ -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
@@ -154,9 +154,9 @@
------------------------------- End Here -----------------------------------
-diff -urNad gtkpod-0.99.10~/scripts/sync-abook.sh gtkpod-0.99.10/scripts/sync-abook.sh
---- gtkpod-0.99.10~/scripts/sync-abook.sh 2007-06-27 21:29:29.000000000 +0200
-+++ gtkpod-0.99.10/scripts/sync-abook.sh 2007-11-18 14:02:27.000000000 +0100
+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
@@ -9,7 +9,7 @@
#
# with the following defaults:
@@ -166,9 +166,9 @@
DATAFILE='~/.abook/addressbook' # the abook db
ENCODING_FROM=UTF-8 # encoding used by abook
ENCODING=ISO-8859-15 # encoding used by ipod
-diff -urNad gtkpod-0.99.10~/scripts/sync-evocalendar.sh gtkpod-0.99.10/scripts/sync-evocalendar.sh
---- gtkpod-0.99.10~/scripts/sync-evocalendar.sh 2007-06-27 21:29:29.000000000 +0200
-+++ gtkpod-0.99.10/scripts/sync-evocalendar.sh 2007-11-18 14:02:27.000000000 +0100
+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
@@ -10,7 +10,7 @@
#
# with the following defaults:
@@ -178,9 +178,9 @@
#the path to a script that will be passed the ical information from STDIN and filter, if needed
#FILTER_SCRIPT=
-diff -urNad gtkpod-0.99.10~/scripts/sync-evolution.sh gtkpod-0.99.10/scripts/sync-evolution.sh
---- gtkpod-0.99.10~/scripts/sync-evolution.sh 2007-06-27 21:29:29.000000000 +0200
-+++ gtkpod-0.99.10/scripts/sync-evolution.sh 2007-11-18 14:02:27.000000000 +0100
+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
@@ -13,7 +13,7 @@
#
# with the following defaults:
@@ -190,9 +190,9 @@
EVOPATH='/opt/gnome/libexec/evolution/2.0:/usr/lib/evolution/2.0:/opt/gnome/bin' # additional path
ENCODING=ISO-8859-15 # encoding used by ipod
-diff -urNad gtkpod-0.99.10~/scripts/sync-kaddressbook.sh gtkpod-0.99.10/scripts/sync-kaddressbook.sh
---- gtkpod-0.99.10~/scripts/sync-kaddressbook.sh 2007-06-27 21:29:29.000000000 +0200
-+++ gtkpod-0.99.10/scripts/sync-kaddressbook.sh 2007-11-18 14:02:27.000000000 +0100
+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
@@ -9,7 +9,7 @@
#
# with the following defaults:
@@ -202,9 +202,9 @@
DATAFILE=~/.kde/share/apps/kabc/std.vcf # vcard file
ENCODING=ISO-8859-15 # encoding used by ipod
-diff -urNad gtkpod-0.99.10~/scripts/sync-korganizer.sh gtkpod-0.99.10/scripts/sync-korganizer.sh
---- gtkpod-0.99.10~/scripts/sync-korganizer.sh 2007-06-27 21:29:29.000000000 +0200
-+++ gtkpod-0.99.10/scripts/sync-korganizer.sh 2007-11-18 14:02:27.000000000 +0100
+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
@@ -9,7 +9,7 @@
#
# with the following defaults:
@@ -214,9 +214,9 @@
DATAFILE=~/.kde/share/apps/korganizer/std.ics # calendar data file
ENCODING=ISO-8859-15 # encoding used by ipod
-diff -urNad gtkpod-0.99.10~/scripts/sync-ldif.sh gtkpod-0.99.10/scripts/sync-ldif.sh
---- gtkpod-0.99.10~/scripts/sync-ldif.sh 2007-06-27 21:29:29.000000000 +0200
-+++ gtkpod-0.99.10/scripts/sync-ldif.sh 2007-11-18 14:02:27.000000000 +0100
+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
@@ -15,7 +15,7 @@
# differently...This is still Chinese for me!! :)
@@ -226,9 +226,21 @@
declare LDIFILE=addressbook.ldif # default filename 'addressbook.ldif'
declare ENCODING=ISO-8859-15 # To try others encodings : 'iconv --list'
declare DELETE="NO" # To delete old .vcf files by default? 'NO'!!
-diff -urNad gtkpod-0.99.10~/scripts/sync-thunderbird-nano.sh gtkpod-0.99.10/scripts/sync-thunderbird-nano.sh
---- gtkpod-0.99.10~/scripts/sync-thunderbird-nano.sh 2007-06-27 21:29:29.000000000 +0200
-+++ gtkpod-0.99.10/scripts/sync-thunderbird-nano.sh 2007-11-18 14:02:27.000000000 +0100
+@@ -41,9 +41,9 @@
+ $(basename $0) doesn't delete old .vcf files by default, but overwrites.
+
+ Options:
+- Syntax : $(basename $0) -f addbook.ldif -m /mnt/ipod -n contactIPOD -d (-h)
++ Syntax : $(basename $0) -f addbook.ldif -m /media/ipod -n contactIPOD -d (-h)
+ [-f] addbook.ldif : contains the .ldif Filename
+- [-m] /mnt/ipod : contains the ipod Mounted directory
++ [-m] /media/ipod : contains the ipod Mounted directory
+ [-n] contactIPOD : contains the .vcf family fileName
+ [-d] : contains the option to Delete all old .vcf files
+ [-h] : contains this Help
+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
@@ -25,7 +25,7 @@
# with the following defaults:
@@ -238,9 +250,9 @@
ENCODING=ISO-8859-15 # encoding used by ipod
NAME=thunderbird # default file export name
FILE_FLAG='' # flag used to determine end of file
-diff -urNad gtkpod-0.99.10~/scripts/sync-thunderbird.sh gtkpod-0.99.10/scripts/sync-thunderbird.sh
---- gtkpod-0.99.10~/scripts/sync-thunderbird.sh 2007-06-27 21:29:29.000000000 +0200
-+++ gtkpod-0.99.10/scripts/sync-thunderbird.sh 2007-11-18 14:02:27.000000000 +0100
+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
@@ -18,7 +18,7 @@
# with the following defaults:
@@ -250,9 +262,9 @@
ENCODING=ISO-8859-15 # encoding used by ipod
NAME=thunderbird # default file export name
-diff -urNad gtkpod-0.99.10~/scripts/sync-webcalendar.sh gtkpod-0.99.10/scripts/sync-webcalendar.sh
---- gtkpod-0.99.10~/scripts/sync-webcalendar.sh 2007-06-27 21:29:29.000000000 +0200
-+++ gtkpod-0.99.10/scripts/sync-webcalendar.sh 2007-11-18 14:02:27.000000000 +0100
+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
@@ -9,7 +9,7 @@
# with the following defaults:
@@ -262,15 +274,3 @@
# uri for webcalendar (example)
DATAFILE='https://somewhere.local/calendar.ics'
# calendar name
-diff -urNad gtkpod-0.99.10~/src/prefs.c gtkpod-0.99.10/src/prefs.c
---- gtkpod-0.99.10~/src/prefs.c 2007-06-27 21:29:33.000000000 +0200
-+++ gtkpod-0.99.10/src/prefs.c 2007-11-18 14:02:27.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/");
More information about the Pkg-gtkpod-devel
mailing list