[Pkg-gtkpod-devel] r275 - in gtkpod/trunk: debian/patches scripts

[nion at alioth.debian.org]

Author: nion
Date: 2007-11-19 17:55:17 +0000 (Mon, 19 Nov 2007)
New Revision: 275

Modified:
   gtkpod/trunk/debian/patches/01_mountpoint.dpatch
   gtkpod/trunk/scripts/sync-ldif.sh
Log:
putting upstream inconsistencies back into the source


Modified: gtkpod/trunk/debian/patches/01_mountpoint.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/01_mountpoint.dpatch	2007-11-19 17:26:24 UTC (rev 274)
+++ gtkpod/trunk/debian/patches/01_mountpoint.dpatch	2007-11-19 17:55:17 UTC (rev 275)
@@ -226,18 +226,6 @@
  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'!!
-@@ -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

Modified: gtkpod/trunk/scripts/sync-ldif.sh
===================================================================
--- gtkpod/trunk/scripts/sync-ldif.sh	2007-11-19 17:26:24 UTC (rev 274)
+++ gtkpod/trunk/scripts/sync-ldif.sh	2007-11-19 17:55:17 UTC (rev 275)
@@ -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