Package: swish-e
Version: 2.4.7-3
Followup-For: Bug #555544
User: [email protected]
Usertags: origin-ubuntu trusty ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Use dh-autoreconf instead of autotools-dev to also fix FTBFS on ppc64el by
getting new libtool macros (still updates config.{sub,guess}).
* Add "m4_include([config/acinclude.m4])" to configure.in to fix FTBFS after
autoreconf.
Thanks for considering the patch.
Logan Rosen
-- System Information:
Debian Release: jessie/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-23-generic (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u swish-e-2.4.7/debian/rules swish-e-2.4.7/debian/rules
--- swish-e-2.4.7/debian/rules
+++ swish-e-2.4.7/debian/rules
@@ -24,7 +24,7 @@
clean:
dh_testdir
dh_testroot
- dh_autotools-dev_restoreconfig
+ dh_autoreconf_clean
dh_clean build.stamp
-( cd perl; $(MAKE) realclean)
-[ ! -f Makefile ] || $(MAKE) distclean
@@ -37,7 +37,7 @@
build: build.stamp
build.stamp:
dh_testdir
- dh_autotools-dev_updateconfig
+ dh_autoreconf
env CC=gcc CFLAGS="$(CFLAGS)" ./configure --mandir=\$${prefix}/share/man --with-libxml2 --with-pcre --prefix=/usr
$(MAKE)
#$(MAKE) docs
diff -u swish-e-2.4.7/debian/control swish-e-2.4.7/debian/control
--- swish-e-2.4.7/debian/control
+++ swish-e-2.4.7/debian/control
@@ -1,10 +1,9 @@
Source: swish-e
Section: web
Priority: optional
-Maintainer: Ubuntu Developers <[email protected]>
-XSBC-Original-Maintainer: Ludovic Drolez <[email protected]>
+Maintainer: Ludovic Drolez <[email protected]>
Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 5), zlib1g-dev, perl, libxml2-dev (>= 2.4.3), libpcre3-dev (>= 3.4), sharutils, autotools-dev
+Build-Depends: debhelper (>= 5), zlib1g-dev, perl, libxml2-dev (>= 2.4.3), libpcre3-dev (>= 3.4), sharutils, dh-autoreconf
Package: swish-e
Architecture: any
only in patch2:
unchanged:
--- swish-e-2.4.7.orig/configure.in
+++ swish-e-2.4.7/configure.in
@@ -12,6 +12,8 @@
BINARY_AGE=0
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
+m4_include([config/acinclude.m4])
+
dnl NOT USED
dnl provide a way to ignore docs
