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

[djpig at alioth.debian.org]

Author: djpig
Date: 2009-01-24 21:09:19 +0000 (Sat, 24 Jan 2009)
New Revision: 366

Removed:
   gtkpod/trunk/debian/patches/20_scripts_bashisms.dpatch
Modified:
   gtkpod/trunk/debian/changelog
   gtkpod/trunk/debian/patches/00list
Log:
drop patch 20_scripts_bashisms, applied upstream

Modified: gtkpod/trunk/debian/changelog
===================================================================
--- gtkpod/trunk/debian/changelog	2009-01-24 21:01:32 UTC (rev 365)
+++ gtkpod/trunk/debian/changelog	2009-01-24 21:09:19 UTC (rev 366)
@@ -2,6 +2,7 @@
 
   * (NOT RELEASED YET) New upstream release
     + drop patch 10_usage--auto, applied upstream
+    + drop patch 20_scripts_bashisms, applied upstream
   * Fix watch file to use SF.net redirector implicetly
 
  -- Frank Lichtenheld <djpig at debian.org>  Sat, 24 Jan 2009 21:07:07 +0100

Modified: gtkpod/trunk/debian/patches/00list
===================================================================
--- gtkpod/trunk/debian/patches/00list	2009-01-24 21:01:32 UTC (rev 365)
+++ gtkpod/trunk/debian/patches/00list	2009-01-24 21:09:19 UTC (rev 366)
@@ -1,2 +1 @@
 01_mountpoint
-20_scripts_bashisms

Deleted: gtkpod/trunk/debian/patches/20_scripts_bashisms.dpatch
===================================================================
--- gtkpod/trunk/debian/patches/20_scripts_bashisms.dpatch	2009-01-24 21:01:32 UTC (rev 365)
+++ gtkpod/trunk/debian/patches/20_scripts_bashisms.dpatch	2009-01-24 21:09:19 UTC (rev 366)
@@ -1,47 +0,0 @@
-#! /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