Hi,

I was slightly mistaken in the nature of the bug.  However, it did
result from a bashism, and there are several more in the file.  I
prepared an NMU which I wanted to upload to the delayed queue.  The
upload is delayed a little though, due to the ssh problems. :-)

Anyway, I'll soon upload it (if I can't manage to log in to gluck
within a week, I'll directly upload to ftp-master).  A patch with the
NMU is attached.

If you want to implement it in a maintainer upload (this way or
differently), please go ahead.  If you need more time than a week, let
me know so I can delay the upload more.

Thanks,
Bas

-- 
I encourage people to send encrypted e-mail (see http://www.gnupg.org).
If you have problems reading my e-mail, use a better reader.
Please send the central message of e-mails as plain text
   in the message body, not as HTML and definitely not as MS Word.
Please do not use the MS Word format for attachments either.
For more information, see http://pcbcn10.phys.rug.nl/e-mail.html
diff -urp old/gnome-common-2.20.0/debian/changelog new/gnome-common-2.20.0/debian/changelog
--- old/gnome-common-2.20.0/debian/changelog	2008-05-14 14:29:09.000000000 +0200
+++ new/gnome-common-2.20.0/debian/changelog	2008-05-14 17:57:16.000000000 +0200
@@ -1,3 +1,12 @@
+gnome-common (2.20.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix bashisms in variable initialisations.
+  * Avoid using AUTOMAKE_VERSION if it isn't defined.  This works around a
+    bashism.  (closes: #378736)
+
+ -- Bas Wijnen <[EMAIL PROTECTED]>  Wed, 14 May 2008 17:55:16 +0200
+
 gnome-common (2.20.0-1) unstable; urgency=low
 
   * New upstream release.
--- /dev/null	2008-01-29 18:13:57.676010616 +0100
+++ new/gnome-common-2.20.0/debian/patches/03_bashisms.patch	2008-05-14 18:13:59.000000000 +0200
@@ -0,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

Attachment: signature.asc
Description: Digital signature

Reply via email to