[SCM] jamin/master: Also include CDBS' autotools.mk
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Wed Jan 11 16:28:56 UTC 2017
The following commit has been merged in the master branch:
commit c9e7a604b22250c32d976eb93629be912950eb88
Author: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
Date: Wed Jan 11 16:57:53 2017 +0100
Also include CDBS' autotools.mk
autoreconf.mk is *not* a replacement
diff --git a/debian/rules b/debian/rules
index 6ca9487..7a8604d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,9 +24,10 @@ DEB_AUTO_UPDATE_AUTOHEADER = 2.65
#DEB_AUTO_UPDATE_AUTOMAKE = 1.14
DEB_AUTO_UPDATE_AUTOMAKE =
DEB_AUTOMAKE_ARGS = --add-missing
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
+include /usr/share/cdbs/1/rules/utils.mk
# Suppress optional build-dependencies, to ease backporting
CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
--
jamin packaging
More information about the pkg-multimedia-commits
mailing list