Package: dacs
Version: 1.4.28b-3
Severity: wishlist
Tags: patch
User: debian-de...@lists.debian.org
Usertags: origin-ubuntu trusty ubuntu-patch autoreconf
Dear Maintainer,
In Ubuntu 14.04, the attached patch was applied to achieve the following:
* Use dh-autoreconf and dh_autotools-dev* for newer arches.
- Specify autoconf macros directory.
This debdiff may contain extraneous metadata. If so, kindly please ignore
them. Thanks for considering the patch!
-- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise-proposed'), (500, 'precise'), (100, 'precise-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.11.0-15-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru dacs-1.4.28b/debian/autoreconf dacs-1.4.28b/debian/autoreconf
--- dacs-1.4.28b/debian/autoreconf 1969-12-31 19:00:00.000000000 -0500
+++ dacs-1.4.28b/debian/autoreconf 2014-02-04 09:25:17.000000000 -0500
@@ -0,0 +1 @@
+src
diff -Nru dacs-1.4.28b/debian/changelog dacs-1.4.28b/debian/changelog
diff -Nru dacs-1.4.28b/debian/control dacs-1.4.28b/debian/control
--- dacs-1.4.28b/debian/control 2013-07-16 11:18:33.000000000 -0400
+++ dacs-1.4.28b/debian/control 2014-02-04 10:01:22.000000000 -0500
@@ -1,11 +1,12 @@
Source: dacs
Section: web
Priority: optional
-Maintainer: Christoph Berg <m...@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christoph Berg <m...@debian.org>
Uploaders: Martin Zobel-Helas <zo...@debian.org>
Build-Depends: debhelper (>= 7),
apache2-dev, libssl-dev, libexpat1-dev, chrpath,
- libsasl2-dev, libperl-dev, libldap2-dev, autotools-dev,
+ libsasl2-dev, libperl-dev, libldap2-dev, dh-autoreconf, autotools-dev,
groff-base, xsltproc, docbook-xsl, libxmlsec1-dev, libpam0g-dev
Standards-Version: 3.9.4
Homepage: http://dacs.dss.ca/
diff -Nru dacs-1.4.28b/debian/patches/autoconf-macros-dir dacs-1.4.28b/debian/patches/autoconf-macros-dir
--- dacs-1.4.28b/debian/patches/autoconf-macros-dir 1969-12-31 19:00:00.000000000 -0500
+++ dacs-1.4.28b/debian/patches/autoconf-macros-dir 2014-02-04 09:42:46.000000000 -0500
@@ -0,0 +1,14 @@
+Index: dacs-1.4.28b/src/configure.ac
+===================================================================
+--- dacs-1.4.28b.orig/src/configure.ac 2014-02-04 09:37:55.008706996 -0500
++++ dacs-1.4.28b/src/configure.ac 2014-02-04 09:42:44.548491223 -0500
+@@ -24,7 +24,8 @@
+
+ AC_PREFIX_DEFAULT(/usr/local/dacs)
+
+-AC_CONFIG_AUX_DIR(./conftools)
++AC_CONFIG_AUX_DIR([./conftools])
++AC_CONFIG_MACRO_DIR([./conftools])
+
+ AC_CONFIG_SRCDIR([var.c])
+
diff -Nru dacs-1.4.28b/debian/patches/series dacs-1.4.28b/debian/patches/series
--- dacs-1.4.28b/debian/patches/series 2013-07-17 14:35:49.000000000 -0400
+++ dacs-1.4.28b/debian/patches/series 2014-02-04 09:28:19.000000000 -0500
@@ -2,3 +2,4 @@
ssl_hook_Fixup
libtool-shell
shared-library-linkage
+autoconf-macros-dir
diff -Nru dacs-1.4.28b/debian/rules dacs-1.4.28b/debian/rules
--- dacs-1.4.28b/debian/rules 2013-07-17 14:38:21.000000000 -0400
+++ dacs-1.4.28b/debian/rules 2014-02-04 09:44:06.000000000 -0500
@@ -2,6 +2,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export AUTOHEADER = true
PKG_APACHE2 := libapache2-mod-dacs
PKG_DACS := dacs
@@ -69,15 +70,8 @@
exit 1 ;\
fi
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- rm -f src/conftools/config.sub
- cp -f /usr/share/misc/config.sub src/conftools/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- rm -f src/conftools/config.guess
- cp -f /usr/share/misc/config.guess src/conftools/config.guess
-endif
-
+ dh_autotools-dev_updateconfig
+ dh_autoreconf
#Linking external libraries and programs
# Apache
@@ -228,13 +222,6 @@
[ ! -f $(CURDIR)/src/Makefile ] || $(MAKE) -C $(CURDIR)/src distclean
[ ! -f $(CURDIR)/apache/Makefile ] || $(MAKE) -C $(CURDIR)/apache distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- rm -f src/conftools/config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- rm -f src/conftools/config.guess
-endif
-
rm -f man/docbook-xsl
rm -f man/*.html
rm -f man/*.man
@@ -258,5 +245,7 @@
rm -f src/.ownername src/.groupname
rm -f configure-stamp build-stamp
+ dh_autoreconf_clean
+ dh_autotools-dev_restoreconfig
+ rm -f src/conftools/lt* src/conftools/libtool.m4
dh_clean
-
