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

[huggie at alioth.debian.org]

Author: huggie
Date: 2008-01-30 12:42:09 +0000 (Wed, 30 Jan 2008)
New Revision: 1583

Added:
   desktop/trunk/xfce4-dev-tools/debian/patches/
   desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit
Modified:
   desktop/trunk/xfce4-dev-tools/debian/changelog
   desktop/trunk/xfce4-dev-tools/debian/rules
Log:
Fix bashism.


Modified: desktop/trunk/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/changelog	2008-01-28 14:06:25 UTC (rev 1582)
+++ desktop/trunk/xfce4-dev-tools/debian/changelog	2008-01-30 12:42:09 UTC (rev 1583)
@@ -1,10 +1,13 @@
 xfce4-dev-tools (4.4.0.1-2) UNRELEASED; urgency=low
 
+  [ Yves-Alexis Perez ]
   * debian/control: make package arch:all.
-  * debian/rules: remove call to simple-patchsys as we don't have any patch.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 02 Jan 2008 20:24:07 +0100
+  [ Simon Huggins ]
+  * Fix bashism in xdt-commit
 
+ -- Simon Huggins <huggie at earth.li>  Wed, 30 Jan 2008 12:06:30 +0000
+
 xfce4-dev-tools (4.4.0.1-1) unstable; urgency=low
 
   [ Yves-Alexis Perez ]

Added: desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit	                        (rev 0)
+++ desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit	2008-01-30 12:42:09 UTC (rev 1583)
@@ -0,0 +1,13 @@
+--- scripts/xdt-commit.orig     2008-01-30 12:01:42.000000000 +0000
++++ scripts/xdt-commit  2008-01-30 12:05:08.000000000 +0000
+@@ -63,8 +63,8 @@
+   # 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
+ 
+     # Check if file is versioned
+     if [ "$STATUS" != "?" ]; then

Modified: desktop/trunk/xfce4-dev-tools/debian/rules
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/rules	2008-01-28 14:06:25 UTC (rev 1582)
+++ desktop/trunk/xfce4-dev-tools/debian/rules	2008-01-30 12:42:09 UTC (rev 1583)
@@ -2,5 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-final