[Pkg-gtkpod-devel] r330 - in gtkpod/trunk/debian: . patches

[djpig at alioth.debian.org]

Author: djpig
Date: 2008-07-10 16:39:03 +0000 (Thu, 10 Jul 2008)
New Revision: 330

Added:
   gtkpod/trunk/debian/patches/20_scripts_bashisms.dpatch
Modified:
   gtkpod/trunk/debian/changelog
   gtkpod/trunk/debian/patches/00list
Log:
Add 20_scripts_bashisms. This fixes bashisms in
the helper scripts or at least makes them explicetly
bash scripts. Reported by Raphael Geissert. (Closes: #489605)


Modified: gtkpod/trunk/debian/changelog
===================================================================
--- gtkpod/trunk/debian/changelog	2008-06-29 13:54:45 UTC (rev 329)
+++ gtkpod/trunk/debian/changelog	2008-07-10 16:39:03 UTC (rev 330)
@@ -1,3 +1,11 @@
+gtkpod (0.99.12-3) unstable; urgency=low
+
+  * Add 20_scripts_bashisms. This fixes bashisms in
+    the helper scripts or at least makes them explicetly
+    bash scripts. Reported by Raphael Geissert. (Closes: #489605)
+
+ -- Frank Lichtenheld <djpig at debian.org>  Thu, 01 May 2008 15:28:18 +0200
+
 gtkpod (0.99.12-2) unstable; urgency=low
 
   * Call dh_icons. Suggested by Sikon (Closes: #466126)

Modified: gtkpod/trunk/debian/patches/00list
===================================================================
--- gtkpod/trunk/debian/patches/00list	2008-06-29 13:54:45 UTC (rev 329)
+++ gtkpod/trunk/debian/patches/00list	2008-07-10 16:39:03 UTC (rev 330)
@@ -1,2 +1,3 @@
 01_mountpoint
 10_usage--auto
+20_scripts_bashisms

Added: gtkpod/trunk/debian/patches/20_scripts_bashisms.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/20_scripts_bashisms.dpatch	                        (rev 0)
+++ gtkpod/trunk/debian/patches/20_scripts_bashisms.dpatch	2008-07-10 16:39:03 UTC (rev 330)
@@ -0,0 +1,47 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_scripts_bashisms.dpatch by Frank Lichtenheld <djpig at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Replace bashisms in scripts or make them explicitly
+## DP: bash scripts if that would be too intrusive.
+
+ at DPATCH@
+diff -urNad trunk~/scripts/sync-evolution.sh trunk/scripts/sync-evolution.sh
+--- trunk~/scripts/sync-evolution.sh	2008-07-10 18:26:36.000000000 +0200
++++ trunk/scripts/sync-evolution.sh	2008-07-10 18:33:44.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Script for syncing evolution addressbook data with iPod
+ # (c) 2004 Clinton Gormley <clint at traveljury dot com>
+ #
+diff -urNad trunk~/scripts/sync-ldif.sh trunk/scripts/sync-ldif.sh
+--- trunk~/scripts/sync-ldif.sh	2008-07-10 18:26:36.000000000 +0200
++++ trunk/scripts/sync-ldif.sh	2008-07-10 18:26:53.000000000 +0200
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ 
+ # Placed under GPL; to know more, see:
+ # 			http://www.gnu.org/licenses/licenses.html
+diff -urNad trunk~/scripts/sync-thunderbird-nano.sh trunk/scripts/sync-thunderbird-nano.sh
+--- trunk~/scripts/sync-thunderbird-nano.sh	2008-07-10 18:26:36.000000000 +0200
++++ trunk/scripts/sync-thunderbird-nano.sh	2008-07-10 18:32:20.000000000 +0200
+@@ -29,7 +29,7 @@
+ ENCODING=ISO-8859-15         # encoding used by ipod
+ NAME=thunderbird             # default file export name
+ FILE_FLAG=''		     # flag used to determine end of file
+-let COUNT=0;		     # file counter
++COUNT=0			     # file counter
+ 
+ # Unless called with "-e=none" this script requires "recode" available
+ # from ftp://ftp.iro.umontreal.ca/pub/recode/recode-3.6.tar.gz
+@@ -80,7 +80,7 @@
+ for line in $(cat $IPOD_MOUNT/Contacts/${NAME}.vcf | sed "s/\ /[54321]/g")
+ do
+ 	if [ "$FILE_FLAG" = 'END' ]; then
+-		let COUNT=$COUNT+1;
++		COUNT=$((COUNT+1));
+ 	fi
+ 
+ 	echo $line | sed "s/\[54321\]/\ /g" >> $IPOD_MOUNT/Contacts/${NAME}$COUNT.vcf


Property changes on: gtkpod/trunk/debian/patches/20_scripts_bashisms.dpatch
___________________________________________________________________
Name: svn:executable
   + *