[Pkg-xfce-commits] r2533 - in desktop/branches/svn-snapshots/xfce4-dev-tools/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-11-14 23:05:34 +0000 (Fri, 14 Nov 2008)
New Revision: 2533

Removed:
   desktop/branches/svn-snapshots/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch
Modified:
   desktop/branches/svn-snapshots/xfce4-dev-tools/debian/changelog
Log:
* debian/patches:
  - 01-fix-bashism-in-xdt-commit dropped, fixed upstream.

Modified: desktop/branches/svn-snapshots/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfce4-dev-tools/debian/changelog	2008-11-14 16:07:51 UTC (rev 2532)
+++ desktop/branches/svn-snapshots/xfce4-dev-tools/debian/changelog	2008-11-14 23:05:34 UTC (rev 2533)
@@ -6,8 +6,10 @@
   * new upstream beta release.
   [ Xfce 4.6 Beta 2 “Hopper”]
   * new upstream beta release.
+  * debian/patches:
+    - 01-fix-bashism-in-xdt-commit dropped, fixed upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 14 Nov 2008 13:40:26 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 14 Nov 2008 23:53:20 +0100
 
 xfce4-dev-tools (4.4.0.1-6) unstable; urgency=low
 

Deleted: desktop/branches/svn-snapshots/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch
===================================================================
--- desktop/branches/svn-snapshots/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch	2008-11-14 16:07:51 UTC (rev 2532)
+++ desktop/branches/svn-snapshots/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit.patch	2008-11-14 23:05:34 UTC (rev 2533)
@@ -1,48 +0,0 @@
-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
-   echo "Subversion needs to be installed."
-   exit 1
- fi
-@@ -37,7 +37,7 @@ fi
- ##
- ## Check if we are in a versioned directory 
- ##
--if ! svn info &> /dev/null; then
-+if ! svn info > /dev/null 2>&1; then
-   echo "Current working directory is not versioned."
-   exit 1
- fi
-@@ -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/')
- 
-     # 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