r15958 - in /desktop/unstable/gnome-common/debian: changelog patches/03_bashisms.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Wed May 14 17:30:24 2008
New Revision: 15958

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15958
Log:
* Fix bashisms in variable initialisations.
* Avoid using AUTOMAKE_VERSION if it isn't defined.  This works around a
  bashism.  (closes: #378736)

Added:
    desktop/unstable/gnome-common/debian/patches/03_bashisms.patch
Modified:
    desktop/unstable/gnome-common/debian/changelog

Modified: desktop/unstable/gnome-common/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-common/debian/changelog?rev=15958&op=diff
==============================================================================
--- desktop/unstable/gnome-common/debian/changelog (original)
+++ desktop/unstable/gnome-common/debian/changelog Wed May 14 17:30:24 2008
@@ -1,3 +1,12 @@
+gnome-common (2.20.0-2) unstable; urgency=low
+
+  [ Bas Wijnen ]
+  * Fix bashisms in variable initialisations.
+  * Avoid using AUTOMAKE_VERSION if it isn't defined.  This works around a
+    bashism.  (closes: #378736)
+
+ -- Loic Minier <lool at dooz.org>  Wed, 14 May 2008 19:25:04 +0200
+
 gnome-common (2.20.0-1) unstable; urgency=low
 
   * New upstream release.

Added: desktop/unstable/gnome-common/debian/patches/03_bashisms.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-common/debian/patches/03_bashisms.patch?rev=15958&op=file
==============================================================================
--- desktop/unstable/gnome-common/debian/patches/03_bashisms.patch (added)
+++ desktop/unstable/gnome-common/debian/patches/03_bashisms.patch Wed May 14 17:30:24 2008
@@ -1,0 +1,54 @@
+Get rid of bashisms, and avoid one in compare_versions.
+
+diff -urp ../old/gnome-common-2.20.0/macros2/gnome-autogen.sh gnome-common-2.20.0/macros2/gnome-autogen.sh
+--- ../old/gnome-common-2.20.0/macros2/gnome-autogen.sh	2008-05-14 18:08:37.000000000 +0200
++++ gnome-common-2.20.0/macros2/gnome-autogen.sh	2008-05-14 18:08:23.000000000 +0200
+@@ -2,24 +2,24 @@
+ # Run this to generate all the initial makefiles, etc.
+ 
+ #name of package
+-PKG_NAME=${PKG_NAME:-Package}
+-srcdir=${srcdir:-.}
++test "$PKG_NAME" || PKG_NAME=Package
++test "$srcdir" || srcdir=.
+ 
+ # default version requirements ...
+-REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53}
+-REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.9}
+-REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.5}
+-REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.12}
+-REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0}
+-REQUIRED_INTLTOOL_VERSION=${REQUIRED_INTLTOOL_VERSION:-0.30}
+-REQUIRED_PKG_CONFIG_VERSION=${REQUIRED_PKG_CONFIG_VERSION:-0.14.0}
+-REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0}
+-REQUIRED_DOC_COMMON_VERSION=${REQUIRED_DOC_COMMON_VERSION:-2.3.0}
+-REQUIRED_GNOME_DOC_UTILS_VERSION=${REQUIRED_GNOME_DOC_UTILS_VERSION:-0.4.2}
++test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53
++test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9
++test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.5
++test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.12
++test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0
++test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.30
++test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0
++test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0
++test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0
++test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2
+ 
+ # a list of required m4 macros.  Package can set an initial value
+-REQUIRED_M4MACROS=${REQUIRED_M4MACROS:-}
+-FORBIDDEN_M4MACROS=${FORBIDDEN_M4MACROS:-}
++test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS=
++test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS=
+ 
+ # Not all echo versions allow -n, so we check what is possible. This test is
+ # based on the one in autoconf.
+@@ -168,7 +168,8 @@ check_m4macros() {
+     # but it contains only Automake's own macros, so we can ignore it.
+ 
+     # Read the dirlist file, supported by Automake >= 1.7.
+-    if compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then
++    # If AUTOMAKE was defined, no version was detected.
++    if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then
+ 	cm_dirlist=`sed 's/[ 	]*#.*//;/^$/d' $cm_macrodirs/dirlist`
+ 	if [ -n "$cm_dirlist" ] ; then
+ 	    for cm_dir in $cm_dirlist; do