summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri John Ledkov <dimitri.j.ledkov@linux.intel.com>2015-08-31 19:44:42 +0100
committerDimitri John Ledkov <dimitri.j.ledkov@linux.intel.com>2015-08-31 19:44:42 +0100
commit568409e8b24fffcdd5e530c8b5dfc23e9c08b5f8 (patch)
treee9148040e40a043e24080628599f40dcd621a892
parent3ae778e22bf4c9cddca8554b3996fa733226e153 (diff)
Use dh-autoreconf to drop had-dependancy on obsolete automake. (Closes: #754046)HEADdebian/1%1.4.2-4.1master
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules4
3 files changed, 10 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index ca56e16..d28bbff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+twinkle (1:1.4.2-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use dh-autoreconf to drop had-dependancy on obsolete
+ automake. (Closes: #754046)
+
+ -- Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> Mon, 31 Aug 2015 19:43:33 +0100
+
twinkle (1:1.4.2-4) unstable; urgency=medium
* Tweak for automake 1.14. closes: #733611.
diff --git a/debian/control b/debian/control
index d39cb23..59e9168 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: comm
Priority: optional
Maintainer: Clint Adams <clint@debian.org>
Build-Depends: debhelper (>= 7), cdbs, help2man,
- autotools-dev, autoconf, automake,
+ autotools-dev, dh-autoreconf,
libcommoncpp2-dev (>= 1.4.2), libccrtp-dev, libzrtpcpp-dev (>= 1.4.0),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libgsm1-dev, libsndfile1-dev, libspeex-dev, libspeexdsp-dev,
diff --git a/debian/rules b/debian/rules
index 9111410..73ab1c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,11 @@
URL = http://www.xs4all.nl/~mfnboer/twinkle/download/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
DEB_CONFIGURE_EXTRA_FLAGS := --without-ilbc --without-kde
-DEB_AUTO_UPDATE_AUTOCONF := yes
-DEB_AUTO_UPDATE_AUTOMAKE := 1.14
-DEB_AUTOMAKE_ARGS := --add-missing --copy
get-orig-source:
@@dh_testdir