rev 18993 - in kde-extras/digikam/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2011-10-22 23:59:37 +0000 (Sat, 22 Oct 2011)
New Revision: 18993

Added:
   kde-extras/digikam/trunk/debian/patches/bashim-fix
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/series
Log:
Fix "bashism in /bin/sh script" Patch from Philipp (Closes: #581078)

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2011-10-22 23:45:05 UTC (rev 18992)
+++ kde-extras/digikam/trunk/debian/changelog	2011-10-22 23:59:37 UTC (rev 18993)
@@ -5,8 +5,9 @@
     - Fixes "FTBFS: /usr/include/KDE/../kwebview.h:31:29: fatal error:
     QtWebKit/QWebView: No such file or directory" (Closes: #644702)
   * Fix "Typos in package description" Patch from Erik (Closes: #644721)
+  * Fix "bashism in /bin/sh script" Patch from Philipp (Closes: #581078)
 
- -- Mark Purcell <msp at debian.org>  Sun, 23 Oct 2011 10:43:44 +1100
+ -- Mark Purcell <msp at debian.org>  Sun, 23 Oct 2011 10:52:33 +1100
 
 digikam (2:2.2.0-1) experimental; urgency=low
 

Added: kde-extras/digikam/trunk/debian/patches/bashim-fix
===================================================================
--- kde-extras/digikam/trunk/debian/patches/bashim-fix	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/bashim-fix	2011-10-22 23:59:37 UTC (rev 18993)
@@ -0,0 +1,39 @@
+# http://bugs.debian.org/581078
+#
+Index: digikam-2.2.0/core/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb
+===================================================================
+--- digikam-2.2.0.orig/core/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb	2011-10-03 21:34:14.000000000 +1100
++++ digikam-2.2.0/core/utilities/scripts/cleanup_digikamdb/cleanup_digikamdb	2011-10-23 10:55:39.000000000 +1100
+@@ -110,14 +110,14 @@
+ 
+ cleanupDB()
+ {
+-    cd "$1" 2&> /dev/null
++    cd "$1" > /dev/null 2>&1
+     if [ $? = 0 ]; then
+         local db_out="${output_str_database}:"
+-        echo -e "${output_str_location}:\t$(pwd)"
++        echo "${output_str_location}:	$(pwd)"
+ 
+         for db in $(eval "find . ${db_find_cmd} 2> /dev/null")
+         do
+-            echo -ne "${db_out}\t${db} ... "
++            echo -n "${db_out}	${db} ... "
+             sqlite3 ${db} "VACUUM;"
+             if [ $? = 0 ]
+             then
+@@ -126,9 +126,12 @@
+                 echo "failed!"
+             fi
+         done
+-        echo -e "\n=> Finished";
++        echo
++        echo "=> Finished"
+     else
+-        echo -e "\nI was not able to enter the database folder.\n"
++        echo
++        echo "I was not able to enter the database folder."
++        echo
+         echo "Make sure that the variable '${config_key}' in your 'digikamrc' config file"
+         echo "is set correctly and that you have permissions to access the database folder."
+     fi

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2011-10-22 23:45:05 UTC (rev 18992)
+++ kde-extras/digikam/trunk/debian/patches/series	2011-10-22 23:59:37 UTC (rev 18993)
@@ -1 +1,2 @@
+bashim-fix
 highgui_c.h