[Pkg-xfce-commits] r1597 - in desktop/trunk/xfce4-dev-tools/debian: . patches
corsac at alioth.debian.org
corsac at alioth.debian.org
Tue Feb 12 07:11:08 UTC 2008
Author: corsac
Date: 2008-02-12 07:11:07 +0000 (Tue, 12 Feb 2008)
New Revision: 1597
Modified:
desktop/trunk/xfce4-dev-tools/debian/changelog
desktop/trunk/xfce4-dev-tools/debian/control
desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit
Log:
really fix bashisms
Modified: desktop/trunk/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/changelog 2008-02-12 07:01:39 UTC (rev 1596)
+++ desktop/trunk/xfce4-dev-tools/debian/changelog 2008-02-12 07:11:07 UTC (rev 1597)
@@ -1,3 +1,13 @@
+xfce4-dev-tools (4.4.0.1-3) UNRELEASED; urgency=low
+
+ * debian/patches: 01-fix-bashism-in-xdt-commit renamed and completed to
+ really fix bashisms. closes: #465380
+ * debian/control:
+ - update standards version to 3.7.3.
+ - update my email address.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 12 Feb 2008 08:09:12 +0100
+
xfce4-dev-tools (4.4.0.1-2) unstable; urgency=low
[ Yves-Alexis Perez ]
@@ -4,7 +14,7 @@
* debian/control: make package arch:all.
[ Simon Huggins ]
- * Fix bashism in xdt-commit. closes: #465380
+ * Fix bashism in xdt-commit
-- Simon Huggins <huggie at earth.li> Wed, 30 Jan 2008 12:06:30 +0000
Modified: desktop/trunk/xfce4-dev-tools/debian/control
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/control 2008-02-12 07:01:39 UTC (rev 1596)
+++ desktop/trunk/xfce4-dev-tools/debian/control 2008-02-12 07:11:07 UTC (rev 1597)
@@ -2,9 +2,9 @@
Section: devel
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at corsac.net>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>
Build-Depends: debhelper (>= 4.1.0), autotools-dev, cdbs
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-dev-tools/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-dev-tools/
Modified: 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 2008-02-12 07:01:39 UTC (rev 1596)
+++ desktop/trunk/xfce4-dev-tools/debian/patches/01-fix-bashism-in-xdt-commit 2008-02-12 07:11:07 UTC (rev 1597)
@@ -1,13 +1,32 @@
---- 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 @@
+--- scripts/xdt-commit.orig 2007-11-17 20:18:07.000000000 +0100
++++ scripts/xdt-commit 2008-02-12 08:07:20.000000000 +0100
+@@ -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 @@
+ ##
+ ## Check if we are in a versioned directory
+ ##
+-if ! svn info &> /dev/null; then
++if ! svn info > /dev/nulli 2>&1; then
+ echo "Current working directory is not versioned."
+ exit 1
+ fi
+@@ -63,8 +63,9 @@
# 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/')
++ #STATUS=${STATUS:0:1} huggie 2008-01-30 bashism fix
++
# Check if file is versioned
if [ "$STATUS" != "?" ]; then
More information about the Pkg-xfce-commits
mailing list