[Pkg-cli-apps-commits] r3786 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/fix_bashisms.dpatch

[diocles-guest at users.alioth.debian.org]

Author: diocles-guest
Date: Sun Mar  9 03:02:43 2008
New Revision: 3786

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3786
Log:
Fix bashisms. (Closes: #464652)

Added:
    packages/f-spot/trunk/debian/patches/fix_bashisms.dpatch   (with props)
Modified:
    packages/f-spot/trunk/debian/changelog
    packages/f-spot/trunk/debian/patches/00list

Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3786&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Sun Mar  9 03:02:43 2008
@@ -13,10 +13,12 @@
       - debian/patches/link_system_libs.dpatch
   * debian/patches/01_build-system.dpatch,
     debian/patches/10_cs-changes.dpatch: Delete unused patches.
+  * debian/patches/fix_bashisms.dpatch: Ensure f-spot-sqlite-upgrade will
+    run correctly under shells other than bash. (Closes: #464652)
   * debian/patches/98_autoreconf.dpatch: Move all automake changes from
     other patches into single patch, for easier maintenance.
 
- -- Tim Retout <tim at retout.co.uk>  Sun, 09 Mar 2008 01:56:33 +0000
+ -- Tim Retout <tim at retout.co.uk>  Sun, 09 Mar 2008 02:59:58 +0000
 
 f-spot (0.4.1-4) unstable; urgency=low
 

Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3786&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Sun Mar  9 03:02:43 2008
@@ -3,6 +3,9 @@
 fix_libfspoteog_linkage
 fix_libfspotjpegtran_linkage
 link_system_libs
+
+# Bugfix for bashisms (#464652)
+fix_bashisms
 
 # Bugfix for build breakage.
 fix_gallery_extension_install_hook

Added: packages/f-spot/trunk/debian/patches/fix_bashisms.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/fix_bashisms.dpatch?rev=3786&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/fix_bashisms.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/fix_bashisms.dpatch Sun Mar  9 03:02:43 2008
@@ -1,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_bashisms.dpatch by Tim Retout <tim at retout.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix bashisms in f-spot-sqlite-upgrade (Debian bug #464652).
+## DP: This was applied upstream as SVN revision 3700.
+
+ at DPATCH@
+diff -urNad f-spot~/tools/f-spot-sqlite-upgrade f-spot/tools/f-spot-sqlite-upgrade
+--- f-spot~/tools/f-spot-sqlite-upgrade	2008-03-09 02:43:50.000000000 +0000
++++ f-spot/tools/f-spot-sqlite-upgrade	2008-03-09 02:55:56.000000000 +0000
+@@ -8,10 +8,10 @@
+ DUMP_LOCATION=$DB_LOCATION.dump
+ NEW_DB_LOCATION=$DB_LOCATION.new
+ 
+-if ! which sqlite >& /dev/null ; then
++if ! which sqlite >/dev/null 2>&1 ; then
+ 	echo "Could not find sqlite binary. Update aborted." >&2
+ 	exit 1
+-elif ! which sqlite3 >& /dev/null ; then
++elif ! which sqlite3 >/dev/null 2>&1 ; then
+ 	echo "Could not find sqlite3 binary. Update aborted." >&2
+ 	exit 1
+ fi
+@@ -26,7 +26,7 @@
+ rm -f $DUMP_LOCATION
+ rm -f $NEW_DB_LOCATION
+ 
+-if grep "^...This file contains an SQLite 2.1 database" $DB_LOCATION &> /dev/null; then
++if grep "^...This file contains an SQLite 2.1 database" $DB_LOCATION >/dev/null 2>&1; then
+ 	echo "Upgrading from SQLite 2.1 to SQLite3"
+ 	cp $DB_LOCATION $BACKUP_LOCATION
+ 	if sqlite $DB_LOCATION .dump > $DUMP_LOCATION &&

Propchange: packages/f-spot/trunk/debian/patches/fix_bashisms.dpatch
------------------------------------------------------------------------------
    svn:executable = *