r20913 - in /desktop/unstable/gnome-common/debian: changelog patches/01_automake-1.11.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Aug 14 16:13:49 2009
New Revision: 20913

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20913
Log:
01_automake-1.11.patch: new patch. Support automake 1.11.
Closes: #541476.

Added:
    desktop/unstable/gnome-common/debian/patches/01_automake-1.11.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=20913&op=diff
==============================================================================
--- desktop/unstable/gnome-common/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-common/debian/changelog [utf-8] Fri Aug 14 16:13:49 2009
@@ -1,8 +1,13 @@
-gnome-common (2.26.0-2) UNRELEASED; urgency=low
+gnome-common (2.26.0-2) unstable; urgency=low
 
+  [ Emilio Pozuelo Monfort ]
   * debian/patches/03_bashisms.patch: forwarded, add headers.
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Tue, 07 Jul 2009 22:49:08 +0200
+  [ Josselin Mouette ]
+  * 01_automake-1.11.patch: new patch. Support automake 1.11.
+    Closes: #541476.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 14 Aug 2009 18:11:29 +0200
 
 gnome-common (2.26.0-1) unstable; urgency=low
 

Added: desktop/unstable/gnome-common/debian/patches/01_automake-1.11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-common/debian/patches/01_automake-1.11.patch?rev=20913&op=file
==============================================================================
--- desktop/unstable/gnome-common/debian/patches/01_automake-1.11.patch (added)
+++ desktop/unstable/gnome-common/debian/patches/01_automake-1.11.patch [utf-8] Fri Aug 14 16:13:49 2009
@@ -1,0 +1,25 @@
+Debian #541476
+Upstream commit d0902887d6dac40dcc79f002a4bed2b492ad15d0
+
+--- macros2/gnome-autogen.sh.orig	2009-08-14 18:07:07.098106130 +0200
++++ macros2/gnome-autogen.sh	2009-08-14 18:08:11.630100290 +0200
+@@ -310,12 +310,13 @@
+ 
+ case $REQUIRED_AUTOMAKE_VERSION in
+     1.4*) automake_progs="automake-1.4" ;;
+-    1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+-    1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+-    1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+-    1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;
+-    1.9*) automake_progs="automake-1.10 automake-1.9" ;;
+-    1.10*) automake_progs="automake-1.10" ;;
++    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
++    1.11*) automake_progs="automake-1.11" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"