I've uploaded the attached NMU. Please note that applying the debdiff with
patch(1) is not sufficient: debian/autogen.sh needs to be executable,
which isn't represented in the diff. The git patches might be more
convenient.
These changes should also be available soon from
<https://anonscm.debian.org/cgit/users/smcv/qa/libidn2.git/>.
On Thu, 23 Nov 2017 at 17:31:33 +0200, Adrian Bunk wrote:
> The only thing special about libidn2 is that it missed the original
> round of RC bugs due to being in NEW for 2.5 months.
If the maintainer-built binaries were discarded when a NEW package
was accepted (<https://bugs.debian.org/798000>) then at least it would
have failed everywhere, avoiding cross-architecture skew. It's
unfortunate that NEW requires binary uploads for at least one
architecture.
Regards,
smcv
diffstat for libidn2-2.0.4 libidn2-2.0.4
autogen.sh | 4 ++++
changelog | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
control | 7 ++++---
rules | 3 +++
4 files changed, 62 insertions(+), 3 deletions(-)
diff -Nru libidn2-2.0.4/debian/autogen.sh libidn2-2.0.4/debian/autogen.sh
--- libidn2-2.0.4/debian/autogen.sh 1970-01-01 01:00:00.000000000 +0100
+++ libidn2-2.0.4/debian/autogen.sh 2017-11-23 11:11:41.000000000 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+gtkdocize --copy
+autoreconf -fi
diff -Nru libidn2-2.0.4/debian/changelog libidn2-2.0.4/debian/changelog
--- libidn2-2.0.4/debian/changelog 2017-09-04 13:17:51.000000000 +0100
+++ libidn2-2.0.4/debian/changelog 2017-11-23 11:11:41.000000000 +0000
@@ -1,3 +1,21 @@
+libidn2 (2.0.4-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Helmut Grohne ]
+ * Fix FTBFS: gtkdocize and add dblatex to Build-Depends. (Closes: #881915)
+
+ [ Simon McVittie ]
+ * Run gtkdocize via a script debian/autogen.sh passed as a parameter
+ to dh_autoreconf, so that the changed gtk-doc.make will be recorded
+ by dh_autoreconf and deleted by dh_autoreconf_clean
+ - Use gtkdocize --copy to avoid gtk-doc.make becoming a symlink, which
+ dh_autoreconf doesn't currently handle
+ * libidn2-doc Breaks/Replaces older versions of both libidn2-dev and
+ libidn2-0-dev (Closes: #881968)
+
+ -- Simon McVittie <s...@debian.org> Thu, 23 Nov 2017 11:11:41 +0000
+
libidn2 (2.0.4-1) unstable; urgency=medium
* Add myself to Uploaders
@@ -38,6 +56,39 @@
-- Simon Josefsson <si...@josefsson.org> Mon, 04 Sep 2017 11:01:44 +0200
+libidn2-0 (2.0.2-5) unstable; urgency=medium
+
+ [ Simon Josefsson ]
+ * Switch libidn2-0-dev back to arch:any again. (Closes: #872567)
+
+ [ Ondřej Surý ]
+ * Make libidn2-dev multi-arch compatible (Closes: #872550)
+
+ -- Ondřej Surý <ond...@debian.org> Mon, 18 Sep 2017 08:00:10 +0200
+
+libidn2-0 (2.0.2-4) unstable; urgency=medium
+
+ * CVE-2017-14061: Fix integer overflow in _isBidi function (Closes: #873904)
+ * CVE-2017-14062: Fix integer overflow in decode_digit (Closes: #873902)
+ * Add upstream fix to stop stripping underscores (Closes: #869561)
+ * Add myself to Uploaders:
+
+ -- Ondřej Surý <ond...@debian.org> Tue, 12 Sep 2017 10:42:14 +0200
+
+libidn2-0 (2.0.2-3) unstable; urgency=low
+
+ * Rename libidn2-0-dev to libidn2-dev.
+ * Ship new transitional package libidn2-0-dev.
+ * Update libidn2-dev.doc-base.
+
+ -- Simon Josefsson <si...@josefsson.org> Wed, 02 Aug 2017 20:27:38 +0200
+
+libidn2-0 (2.0.2-2) unstable; urgency=low
+
+ * Ship pkg-config file in libidn2-0-dev. Closes: #855948.
+
+ -- Simon Josefsson <si...@josefsson.org> Mon, 17 Jul 2017 08:50:44 +0200
+
libidn2-0 (2.0.2-1) unstable; urgency=low
* New upstream release.
diff -Nru libidn2-2.0.4/debian/control libidn2-2.0.4/debian/control
--- libidn2-2.0.4/debian/control 2017-09-04 13:17:51.000000000 +0100
+++ libidn2-2.0.4/debian/control 2017-11-23 11:11:41.000000000 +0000
@@ -12,7 +12,8 @@
ruby-ronn,
texinfo,
texlive,
- gtk-doc-tools
+ gtk-doc-tools,
+ dblatex,
Standards-Version: 4.1.0
Priority: optional
Homepage: https://www.gnu.org/software/libidn/#libidn2
@@ -71,8 +72,8 @@
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Replaces: libidn2-0-dev (<< 2.0.3-1~)
-Breaks: libidn2-0-dev (<< 2.0.3-1~)
+Replaces: libidn2-0-dev (<< 2.0.3-1~), libidn2-dev (<< 2.0.3-1~)
+Breaks: libidn2-0-dev (<< 2.0.3-1~), libidn2-dev (<< 2.0.3-1~)
Recommends: libidn2-dev
Description: Internationalized domain names (IDNA2008/TR46) documentation
Libidn2 implements the revised algorithm for internationalized domain
diff -Nru libidn2-2.0.4/debian/rules libidn2-2.0.4/debian/rules
--- libidn2-2.0.4/debian/rules 2017-09-04 13:17:51.000000000 +0100
+++ libidn2-2.0.4/debian/rules 2017-11-23 11:11:41.000000000 +0000
@@ -5,6 +5,9 @@
%:
dh $@ --parallel --with autoreconf --fail-missing -O--dbgsym-migration="libidn2-0-dbg (<< 2.0.2-1~)" -X.la
+override_dh_autoreconf:
+ dh_autoreconf debian/autogen.sh
+
override_dh_auto_configure:
dh_auto_configure -- \
--enable-ld-version-script \
>From 47dce702411c4b4c4c86015b9609f82268282a5e Mon Sep 17 00:00:00 2001
From: Helmut Grohne <hel...@subdivi.de>
Date: Fri, 17 Nov 2017 22:43:07 +0100
Subject: [PATCH 1/4] Fix FTBFS: gtkdocize and add dblatex to Build-Depends.
(Closes: #881915)
---
debian/changelog | 7 +++++++
debian/control | 3 ++-
debian/rules | 5 +++++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index c27cd70..607178a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libidn2 (2.0.4-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS: gtkdocize and add dblatex to Build-Depends. (Closes: #881915)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 17 Nov 2017 22:43:07 +0100
+
libidn2 (2.0.4-1) unstable; urgency=medium
* Add myself to Uploaders
diff --git a/debian/control b/debian/control
index b441c4b..2f9e798 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 9),
ruby-ronn,
texinfo,
texlive,
- gtk-doc-tools
+ gtk-doc-tools,
+ dblatex,
Standards-Version: 4.1.0
Priority: optional
Homepage: https://www.gnu.org/software/libidn/#libidn2
diff --git a/debian/rules b/debian/rules
index 1a6212b..5790fa3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@ --parallel --with autoreconf --fail-missing -O--dbgsym-migration="libidn2-0-dbg (<< 2.0.2-1~)" -X.la
+override_dh_autoreconf:
+ rm -f gtk-doc.make
+ gtkdocize
+ dh_autoreconf
+
override_dh_auto_configure:
dh_auto_configure -- \
--enable-ld-version-script \
--
2.15.0
>From e1e70e45ec8d8ddf929f803b50f624ee5381dc32 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Wed, 22 Nov 2017 08:28:00 +0000
Subject: [PATCH 2/4] Run gtkdocize via debian/autogen.sh
This is passed as a parameter to dh_autoreconf, so that the changed
gtk-doc.make will be detected by dh_autoreconf and deleted in
dh_autoreconf_clean.
Use gtkdocize --copy so that it doesn't replace plain files with
symlinks, which dh_autoreconf_clean doesn't currently know how to undo.
---
debian/autogen.sh | 4 ++++
debian/changelog | 9 +++++++++
debian/rules | 4 +---
3 files changed, 14 insertions(+), 3 deletions(-)
create mode 100755 debian/autogen.sh
diff --git a/debian/autogen.sh b/debian/autogen.sh
new file mode 100755
index 0000000..38ef0ff
--- /dev/null
+++ b/debian/autogen.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+gtkdocize --copy
+autoreconf -fi
diff --git a/debian/changelog b/debian/changelog
index 607178a..3cf9420 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
libidn2 (2.0.4-1.1) UNRELEASED; urgency=medium
* Non-maintainer upload.
+
+ [ Helmut Grohne ]
* Fix FTBFS: gtkdocize and add dblatex to Build-Depends. (Closes: #881915)
+ [ Simon McVittie ]
+ * Run gtkdocize via a script debian/autogen.sh passed as a parameter
+ to dh_autoreconf, so that the changed gtk-doc.make will be recorded
+ by dh_autoreconf and deleted by dh_autoreconf_clean
+ - Use gtkdocize --copy to avoid gtk-doc.make becoming a symlink, which
+ dh_autoreconf doesn't currently handle
+
-- Helmut Grohne <hel...@subdivi.de> Fri, 17 Nov 2017 22:43:07 +0100
libidn2 (2.0.4-1) unstable; urgency=medium
diff --git a/debian/rules b/debian/rules
index 5790fa3..e013df1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
dh $@ --parallel --with autoreconf --fail-missing -O--dbgsym-migration="libidn2-0-dbg (<< 2.0.2-1~)" -X.la
override_dh_autoreconf:
- rm -f gtk-doc.make
- gtkdocize
- dh_autoreconf
+ dh_autoreconf debian/autogen.sh
override_dh_auto_configure:
dh_auto_configure -- \
--
2.15.0
>From fa446226a68e20a7a30ecac62b0abe60c0d634df Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Wed, 22 Nov 2017 08:31:37 +0000
Subject: [PATCH 3/4] libidn2-doc Breaks/Replaces older versions of both
libidn2-dev and libidn2-0-dev (Closes: #881968)
---
debian/changelog | 2 ++
debian/control | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3cf9420..54bdcb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ libidn2 (2.0.4-1.1) UNRELEASED; urgency=medium
by dh_autoreconf and deleted by dh_autoreconf_clean
- Use gtkdocize --copy to avoid gtk-doc.make becoming a symlink, which
dh_autoreconf doesn't currently handle
+ * libidn2-doc Breaks/Replaces older versions of both libidn2-dev and
+ libidn2-0-dev (Closes: #881968)
-- Helmut Grohne <hel...@subdivi.de> Fri, 17 Nov 2017 22:43:07 +0100
diff --git a/debian/control b/debian/control
index 2f9e798..697ff25 100644
--- a/debian/control
+++ b/debian/control
@@ -72,8 +72,8 @@ Package: libidn2-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Replaces: libidn2-0-dev (<< 2.0.3-1~)
-Breaks: libidn2-0-dev (<< 2.0.3-1~)
+Replaces: libidn2-0-dev (<< 2.0.3-1~), libidn2-dev (<< 2.0.3-1~)
+Breaks: libidn2-0-dev (<< 2.0.3-1~), libidn2-dev (<< 2.0.3-1~)
Recommends: libidn2-dev
Description: Internationalized domain names (IDNA2008/TR46) documentation
Libidn2 implements the revised algorithm for internationalized domain
--
2.15.0
>From 9246c334d48a739e0a30546484cfe684401d2b4f Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Thu, 23 Nov 2017 11:11:48 +0000
Subject: [PATCH 4/4] NMU
---
debian/changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 54bdcb3..5f1acc0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libidn2 (2.0.4-1.1) UNRELEASED; urgency=medium
+libidn2 (2.0.4-1.1) unstable; urgency=medium
* Non-maintainer upload.
@@ -14,7 +14,7 @@ libidn2 (2.0.4-1.1) UNRELEASED; urgency=medium
* libidn2-doc Breaks/Replaces older versions of both libidn2-dev and
libidn2-0-dev (Closes: #881968)
- -- Helmut Grohne <hel...@subdivi.de> Fri, 17 Nov 2017 22:43:07 +0100
+ -- Simon McVittie <s...@debian.org> Thu, 23 Nov 2017 11:11:41 +0000
libidn2 (2.0.4-1) unstable; urgency=medium
--
2.15.0
