[SCM] zynjacku/master: Add patch to avoid FTBFS with autoreconf.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Mar 9 23:15:34 UTC 2011


The following commit has been merged in the master branch:
commit a29c5a9196e941d72653b81149d904c0d201e1db
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Mar 10 00:15:24 2011 +0100

    Add patch to avoid FTBFS with autoreconf.

diff --git a/debian/patches/1002-buildsystem.patch b/debian/patches/1002-buildsystem.patch
new file mode 100644
index 0000000..264255e
--- /dev/null
+++ b/debian/patches/1002-buildsystem.patch
@@ -0,0 +1,30 @@
+Description: Adjust buildsystem to avoid FTBFS with autoreconf.
+ AM_CPPFLAGS is an user variable and must not be overridden.
+ Set 'foreign' mode.
+---
+ Makefile.am  |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- zynjacku.orig/Makefile.am
++++ zynjacku/Makefile.am
+@@ -21,7 +21,7 @@ DEFAULT_INCLUDES =
+ 
+ # we need this in order to include config.h with build dir != src dir
+ if NOT_TOP_BUILD
+-CPPFLAGS += -I$(top_builddir)
++AM_CPPFLAGS = -I$(top_builddir)
+ endif
+ 
+ zynjacku_c_CFLAGS = -DDATA_DIR='"$(pkgdatadir)"' -Wall -g
+--- zynjacku.orig/configure.ac
++++ zynjacku/configure.ac
+@@ -22,7 +22,7 @@
+ AC_PREREQ(2.61)
+ AC_INIT(zynjacku, 5.2)
+ AC_CONFIG_AUX_DIR(config)
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE(foreign)
+ AC_CONFIG_HEADER([config.h])
+ 
+ AM_CONDITIONAL(NOT_TOP_BUILD, test "$srcdir" != ".")
diff --git a/debian/patches/series b/debian/patches/series
index e4dd238..b4def8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 0012-fix_parsing_lv2rack_cmdline.patch
 0013-hangs_on_missing_license_field.patch
 1001-shebangs.patch
+1002-buildsystem.patch

-- 
zynjacku packaging



More information about the pkg-multimedia-commits mailing list