[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, experimental, updated. debian/2.0.1-1-20-g0fb8c30

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 0f06608bbcf639c8ace3f2f4c329823c9dbd22da
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat May 28 16:16:02 2011 +0800

    Backport upstream patch to fix autoreconf
    
    This moves ACLOCAL_AMFLAGS from configure.ac into Makefile.am.

diff --git a/debian/patches/0001-Move-ACLOCAL_AMFLAGS-into-Makefile.am.patch b/debian/patches/0001-Move-ACLOCAL_AMFLAGS-into-Makefile.am.patch
new file mode 100644
index 0000000..932f612
--- /dev/null
+++ b/debian/patches/0001-Move-ACLOCAL_AMFLAGS-into-Makefile.am.patch
@@ -0,0 +1,36 @@
+From dadeefbc80a2bb88ae4981c0db62de55eaee27c7 Mon Sep 17 00:00:00 2001
+From: Chow Loong Jin <hyperair at ubuntu.com>
+Date: Sat, 28 May 2011 16:00:45 +0800
+Subject: [PATCH] Move ACLOCAL_AMFLAGS into Makefile.am
+
+This is so that autoreconf works when called manually
+---
+ Makefile.am  |    2 ++
+ configure.ac |    1 -
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index c609bdf..1e26db7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,5 @@
++ACLOCAL_AMFLAGS = -I build/m4/shamrock -I build/m4/shave -I build/m4/extensions ${ACLOCAL_FLAGS}
++
+ SUBDIRS = \
+ 	build \
+ 	help \
+diff --git a/configure.ac b/configure.ac
+index 2eace3a..bb9b864 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,6 @@ AC_INIT([banshee-community-extensions], 2.0.0,
+ AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar dist-zip foreign])
+ AM_MAINTAINER_MODE
+ AM_CONFIG_HEADER([config.h])
+-AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/shamrock -I build/m4/shave -I build/m4/extensions \${ACLOCAL_FLAGS}"])
+ 
+ IT_PROG_INTLTOOL([0.35.0])
+ AC_PROG_LIBTOOL
+-- 
+1.7.4.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 2558e82..154b63f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Use-DBus-instead-of-NDesk.DBus.patch
+0001-Move-ACLOCAL_AMFLAGS-into-Makefile.am.patch
 fsck-intltool.patch

-- 
banshee-community-extensions