Package: autotools-dev
Version: 20161112.1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for autotools-dev (versioned as 20161112.1+nmu1). The diff
is attached to this message.
(Note that I bumped the removal compat level from 11 to 12 as people
have slowly started to use the experimental compat 11)
Regards.
diff -Nru autotools-dev-20161112.1/debian/autotools_dev.pm
autotools-dev-20161112.1+nmu1/debian/autotools_dev.pm
--- autotools-dev-20161112.1/debian/autotools_dev.pm 2016-11-12
20:18:52.000000000 +0000
+++ autotools-dev-20161112.1+nmu1/debian/autotools_dev.pm 2017-10-22
12:33:43.000000000 +0000
@@ -3,6 +3,9 @@
use strict;
use Debian::Debhelper::Dh_Lib;
+
+deprecated_functionality('The autotools-dev sequence is deprecated and
replaced by dh in debhelper (>= 9.20160115)', 12);
+
insert_before("dh_auto_configure", "dh_autotools-dev_updateconfig");
insert_before("dh_clean", "dh_autotools-dev_restoreconfig");
diff -Nru autotools-dev-20161112.1/debian/autotools-dev.README.Debian
autotools-dev-20161112.1+nmu1/debian/autotools-dev.README.Debian
--- autotools-dev-20161112.1/debian/autotools-dev.README.Debian 2016-11-12
20:18:52.000000000 +0000
+++ autotools-dev-20161112.1+nmu1/debian/autotools-dev.README.Debian
2017-10-22 12:32:48.000000000 +0000
@@ -119,8 +119,8 @@
You do *not* have the choice of using this method when libtool is being
used in the build. Use the method 1 above, instead.
- You can use dh_autotools* to help automate the config.sub and
- config.guess update at package build time.
+ You can use dh_update_autotools_config from debhelper to help automate
+ the config.sub and config.guess update at package build time.
This document contains enough information to properly implement any of the
@@ -336,20 +336,19 @@
Using the debhelper helpers:
-If you use the "dh" command provided by debhelper mode v7 and newer,
-please check the dh_autotools-dev_updateconfig manpage on how to enable
-the "autotools_dev" dh module. It will update config.sub and config.guess
-for the build.
+If you use the "dh" command provided by debhelper at version 9.20160115
+or later, then it will automatically call dh_update_autotools_config to
+update config.sub and config.guess for the build.
You should also check the dh-autoreconf documentation to automate
-retooling on build time, which is preferred over just updating config.sub
-and config.guess. Do NOT use dh-autoreconf and dh_autotools-dev_* helpers
-at the same time, dh-autoreconf takes care of updating config.sub and
-config.guess by itself.
-
-dh_autotools-dev_updateconfig and dh_autotools-dev_restoreconfig can be
-used directly instead of the "dh" module. Refer to their respective
-manpages for examples.
+retooling on build time, which is preferred over just updating
+config.sub and config.guess. Be careful with mixing the "autoreconf"
+and "autotools-dev" dh sequences as they are order sensitive. Please
+consider simply removing the "autotools-dev" sequence and rely on
+debhelper (>= 9.20160115) built-in functionality.
+
+dh_update_autotools_config can be used directly without relying on "dh".
+Refer to its manpage for more information.
CDBS-based packages:
diff -Nru autotools-dev-20161112.1/debian/changelog
autotools-dev-20161112.1+nmu1/debian/changelog
--- autotools-dev-20161112.1/debian/changelog 2016-11-12 20:18:52.000000000
+0000
+++ autotools-dev-20161112.1+nmu1/debian/changelog 2017-10-22
12:33:43.000000000 +0000
@@ -1,3 +1,13 @@
+autotools-dev (20161112.1+nmu1) unstable; urgency=medium
+
+ * Non-maintainer upload with maintainer's permission.
+ * Deprecate debhelper tools and sequence. They have been
+ replaced by debhelper (>= 9.20160115). (Closes: #878528)
+ * Update autotools-dev.README.Debian to reflect the current
+ status. (Closes: #812521)
+
+ -- Niels Thykier <[email protected]> Sun, 22 Oct 2017 12:33:43 +0000
+
autotools-dev (20161112.1) unstable; urgency=medium
* Sync to upstream git 2016-11-12
diff -Nru autotools-dev-20161112.1/debian/dh_autotools-dev_restoreconfig
autotools-dev-20161112.1+nmu1/debian/dh_autotools-dev_restoreconfig
--- autotools-dev-20161112.1/debian/dh_autotools-dev_restoreconfig
2016-11-12 20:18:52.000000000 +0000
+++ autotools-dev-20161112.1+nmu1/debian/dh_autotools-dev_restoreconfig
2017-10-22 12:33:43.000000000 +0000
@@ -15,6 +15,13 @@
=head1 DESCRIPTION
+B<Deprecated>: dh_autotools-dev_updateconfig and
+dh_autotools-dev_restoreconfig are deprecated and replaced by
+L<dh_update_autotools_config(1)> and L<dh_clean(1)> from debhelper.
+Please replace all uses of dh_autotools-dev_updateconfig with
+dh_update_autotools_config and then remove any use of
+dh_autotools-dev_restoreconfig.
+
dh_autotools-dev_restoreconfig restores the original B<config.sub> and
B<config.guess>
files that have been backed up by dh_autotools-dev_updateconfig under the names
B<config.sub.dh-orig> and B<config.guess.dh-orig>.
@@ -40,6 +47,8 @@
init();
+deprecated_functionality('dh_autotools-dev_restoreconfig is deprecated; please
see dh_autotools-dev_restoreconfig(1) for a replacement', 12);
+
complex_doit('for c_g in `find . -type f -name config.guess` ; do if test -e
"$c_g.dh-orig" ; then mv -f "$c_g.dh-orig" "$c_g" ; fi ; done');
complex_doit('for c_s in `find . -type f -name config.sub` ; do if test -e
"$c_s.dh-orig" ; then mv -f "$c_s.dh-orig" "$c_s" ; fi ; done');
complex_doit('find . -type f \( -name config.guess.dh-orig -o -name
config.sub.dh-orig \) -delete');
diff -Nru autotools-dev-20161112.1/debian/dh_autotools-dev_updateconfig
autotools-dev-20161112.1+nmu1/debian/dh_autotools-dev_updateconfig
--- autotools-dev-20161112.1/debian/dh_autotools-dev_updateconfig
2016-11-12 20:18:52.000000000 +0000
+++ autotools-dev-20161112.1+nmu1/debian/dh_autotools-dev_updateconfig
2017-10-22 12:33:43.000000000 +0000
@@ -15,6 +15,14 @@
=head1 DESCRIPTION
+B<Deprecated>: dh_autotools-dev_updateconfig and
+dh_autotools-dev_restoreconfig are deprecated and replaced by
+L<dh_update_autotools_config(1)> and L<dh_clean(1)> from debhelper.
+Please replace all uses of dh_autotools-dev_updateconfig with
+dh_update_autotools_config and then remove any use of
+dh_autotools-dev_restoreconfig.
+
+
dh_autotools-dev_updateconfig replaces all occurances of B<config.sub> and
B<config.guess>
in the source tree by the up-to-date versions found in the autotools-dev
package.
The original files are backed up under the names B<config.sub.dh-orig> and
@@ -40,6 +48,8 @@
init();
+deprecated_functionality('dh_autotools-dev_updateconfig is deprecated; please
see dh_autotools-dev_updateconfig(1) for a replacement', 12);
+
complex_doit('for c_g in `find -type f -name config.guess` ; do if ! test -e
"$c_g.dh-orig" ; then mv -f "$c_g" "$c_g.dh-orig" ; cp -f
/usr/share/misc/config.guess "$c_g" ; fi ; done');
complex_doit('for c_s in `find -type f -name config.sub` ; do if ! test -e
"$c_s.dh-orig" ; then mv -f "$c_s" "$c_s.dh-orig" ; cp -f
/usr/share/misc/config.sub "$c_s" ; fi ; done');
