[Pkg-xfce-commits] r2139 - in desktop/trunk/xfce4-dev-tools/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-06-20 06:42:53 +0000 (Fri, 20 Jun 2008)
New Revision: 2139

Modified:
   desktop/trunk/xfce4-dev-tools/debian/changelog
   desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch
Log:
* debian/patches:
 - refresh 01-fix-bashism-in-xdt-commit to catch one more bashism.

Modified: desktop/trunk/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/changelog	2008-06-19 11:27:02 UTC (rev 2138)
+++ desktop/trunk/xfce4-dev-tools/debian/changelog	2008-06-20 06:42:53 UTC (rev 2139)
@@ -1,3 +1,10 @@
+xfce4-dev-tools (4.4.0.1-6) UNRELEASED; urgency=low
+
+  * debian/patches:
+   - refresh 01-fix-bashism-in-xdt-commit to catch one more bashism.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 20 Jun 2008 08:42:07 +0200
+
 xfce4-dev-tools (4.4.0.1-5) unstable; urgency=low
 
   * debian/control: add Recommends on autoconf, automake, intltool, libtool.

Modified: desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch	2008-06-19 11:27:02 UTC (rev 2138)
+++ desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch	2008-06-20 06:42:53 UTC (rev 2139)
@@ -1,15 +1,24 @@
---- scripts/xdt-commit.orig	2007-11-17 20:18:07.000000000 +0100
-+++ scripts/xdt-commit	2008-02-12 08:07:20.000000000 +0100
+commit 4765b456f90a86ed8ab2de8ab1085f7f4c02ee96
+Author: Yves-Alexis Perez <corsac at debian.org>
+Date:   Fri Jun 20 08:23:16 2008 +0200
+
+    fix bashisms
+    Signed-off-by: Yves-Alexis Perez <corsac at debian.org>
+
+diff --git a/scripts/xdt-commit b/scripts/xdt-commit
+index cab95ae..efcc8db 100755
+--- a/scripts/xdt-commit
++++ b/scripts/xdt-commit
 @@ -28,7 +28,7 @@
  ##
  ## Check if SVN is installed
  ##
 -if ! type svn &> /dev/null; then
-+if ! type svn > /dev/null 2>&1; then
++if ! type svn > /dev/nulli 2>&1; then
    echo "Subversion needs to be installed."
    exit 1
  fi
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ fi
  ##
  ## Check if we are in a versioned directory 
  ##
@@ -18,15 +27,22 @@
    echo "Current working directory is not versioned."
    exit 1
  fi
-@@ -63,8 +63,9 @@
+@@ -63,8 +63,7 @@ for CHANGELOG in $CHANGELOGS; do
    # Make sure the file exists
    if [ -f "$CHANGELOG" ]; then
      # Determine SVN status 
 -    STATUS=$(svn status "${CHANGELOG}")
 -    STATUS=${STATUS:0:1}
-+	STATUS=$(svn status "${CHANGELOG}"|sed -e 's/^\(.\).*$/\1/')
-+	#STATUS=${STATUS:0:1} huggie 2008-01-30 bashism fix
-+
++    STATUS=$(svn status "${CHANGELOG}"|sed -e 's/^\(.\).*$/\1/')
  
      # Check if file is versioned
      if [ "$STATUS" != "?" ]; then
+@@ -75,7 +74,7 @@ for CHANGELOG in $CHANGELOGS; do
+       if [ -z "$COMMIT_MSG" ]; then
+         COMMIT_MSG="$MSG"
+       else
+-        COMMIT_MSG=$(echo "$COMMIT_MSG" $'\n' "$MSG")
++        COMMIT_MSG=$(echo "$COMMIT_MSG" $(printf '\n') "$MSG")
+       fi
+     fi
+   fi