Your message dated Thu, 13 Nov 2014 01:04:30 +0000
with message-id <e1xoipq-0004ro...@franck.debian.org>
and subject line Bug#768937: fixed in zsh 5.0.7-4
has caused the Debian Bug report #768937,
regarding zsh: [patch] not binNMU-safe due to --link-doc between arch-dep and
arch-indep
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
768937: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768937
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: zsh
Version: 5.0.7-3.1+b1
Severity: serious
Tags: patch
Justification: uninstallable
As noted on #747141, it is not safe for dh_installdocs --link-doc to
link together the documentation directories of an architecture-dependent
package and an architecture-independent package, because the resulting
lockstep dependency is unsatisfiable after the architecture-dependent
package receives a binNMU.
Here's a patch to fix that, using the approach that Axel Beckert
described on that bug:
> > - change the affected packages in question to not use --link-doc.
> That's likely the way I'd go with zsh then, with the addition of some
> additional symlinks from /usr/share/doc/zsh/something to
> /usr/share/doc/zsh-common/something for most files not being
> changelogs. *sigh*
I changed zsh-dbg from "docs linked to zsh-common" to "docs linked to zsh",
and installed the bare minimum of Policy-required docs in zsh.
zsh-dev is now self-contained (I don't think it's worth optimizing
its size).
I put the dpkg-maintscript glue to migrate /usr/share/doc/zsh from a
directory to a symlink in both zsh and zsh-common, because both packages
ship files in that directory now, and either package might be unpacked first.
Regards,
S
>From 9450b3c0ac7d7996a6cd4bab45e27fb24e5ec805 Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Mon, 10 Nov 2014 10:20:21 +0000
Subject: [PATCH] Be binNMU-safe: do not use dh_installdocs
--link-doc=zsh-common in architecture-dependent packages
---
debian/changelog | 10 ++++++++++
debian/rules | 22 +++++++++++++++++++---
debian/zsh-common.dirs | 1 +
debian/zsh-common.maintscript | 1 +
debian/zsh-dev.maintscript | 1 +
debian/zsh.maintscript | 1 +
6 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 debian/zsh-common.maintscript
create mode 100644 debian/zsh-dev.maintscript
create mode 100644 debian/zsh.maintscript
diff --git a/debian/changelog b/debian/changelog
index 6046a6f..c190bcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+zsh (5.0.7-3.1) UNRELEASED; urgency=medium
+
+ * Be binNMU-safe: do not use dh_installdocs --link-doc=zsh-common
+ in architecture-dependent packages
+ * Symlink zsh-common documentation files into /usr/share/doc/zsh
+ * Migrate /usr/share/doc/zsh and /usr/share/doc/zsh-dev from symlink
+ to directory using dpkg-maintscript-helper
+
+ -- Simon McVittie <s...@debian.org> Mon, 10 Nov 2014 08:21:42 +0000
+
zsh (5.0.7-3) unstable; urgency=low
* Upload to unstable again
diff --git a/debian/rules b/debian/rules
index c322e7c..7db7920 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,6 +155,15 @@ binary-indep: build-indep binary-arch-dynamic
dh_installchangelogs -pzsh-doc -pzsh-common
dh_lintian -i
dh_compress -i -Xpdf
+ set -e; cd debian/zsh-common/usr/share/doc/zsh-common; for x in *; do \
+ case "$$x" in \
+ (copyright|changelog.Debian.gz) \
+ ;; \
+ (*) \
+ ln -s ../zsh-common/$$x ../zsh/$$x; \
+ ;; \
+ esac; \
+ done
dh_fixperms -i
dh_installdeb -i
dh_md5sums -i
@@ -182,7 +191,12 @@ binary-arch-dynamic: build-arch
-dDepends debian/zsh/bin/* \
-dRecommends debian/zsh/usr/lib/*/zsh/*/zsh/*.so
- dh_installdocs -pzsh -pzsh-dbg --link-doc=zsh-common
+ dh_installdocs -pzsh -pzsh-dbg --link-doc=zsh
+ dh_installchangelogs -pzsh
+ # These are in zsh-common and there is no Policy reason why
+ # they can't be
+ rm -v -f debian/zsh/usr/share/doc/zsh/changelog
+ rm -v -f debian/zsh/usr/share/doc/zsh/NEWS.Debian
binary-arch-static: build-static
dh_testdir
@@ -192,7 +206,8 @@ binary-arch-static: build-static
# Do not symlink /usr/share/doc/zsh-static to
# /usr/share/doc/zsh-common because zsh-static has a unique,
- # generated README.Debian
+ # generated README.Debian, and because --link-doc between
+ # arch-dep and arch-indep packages breaks binNMUs
dh_installdocs -pzsh-static
awk 'BEGIN { print "The following modules are statically-compiled into the static zsh binary:\n"; } /link=static/ { printf "%s (%s %s)\n", substr($$1,6), $$4, $$5; }' obj-static/config.modules >debian/zsh-static/usr/share/doc/zsh-static/README.Debian
@@ -215,7 +230,8 @@ binary-arch-dev: build-arch
cd debian/zsh-dev/usr/share/aclocal; mv aczshoot.m4 zshoot.m4
- dh_installdocs -pzsh-dev --link-doc=zsh-common
+ dh_installdocs -pzsh-dev
+ dh_installchangelogs -pzsh-dev
binary-arch: binary-arch-dynamic binary-arch-static binary-arch-dev
dh_lintian -a
diff --git a/debian/zsh-common.dirs b/debian/zsh-common.dirs
index bf201bb..51addab 100644
--- a/debian/zsh-common.dirs
+++ b/debian/zsh-common.dirs
@@ -1,3 +1,4 @@
etc/zsh
+usr/share/doc/zsh
usr/share/man
usr/share/zsh/help
diff --git a/debian/zsh-common.maintscript b/debian/zsh-common.maintscript
new file mode 100644
index 0000000..93427a2
--- /dev/null
+++ b/debian/zsh-common.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/zsh zsh-common 5.0.7-3
diff --git a/debian/zsh-dev.maintscript b/debian/zsh-dev.maintscript
new file mode 100644
index 0000000..c6e45a8
--- /dev/null
+++ b/debian/zsh-dev.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/zsh-dev zsh-common 5.0.7-3
diff --git a/debian/zsh.maintscript b/debian/zsh.maintscript
new file mode 100644
index 0000000..93427a2
--- /dev/null
+++ b/debian/zsh.maintscript
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/zsh zsh-common 5.0.7-3
--
2.1.3
--- End Message ---
--- Begin Message ---
Source: zsh
Source-Version: 5.0.7-4
We believe that the bug you reported is fixed in the latest version of
zsh, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 768...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Axel Beckert <a...@debian.org> (supplier of updated zsh package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Thu, 13 Nov 2014 01:18:54 +0100
Source: zsh
Binary: zsh-common zsh zsh-doc zsh-static zsh-dev zsh-dbg zsh-beta zsh-beta-doc
Architecture: source all amd64
Version: 5.0.7-4
Distribution: unstable
Urgency: medium
Maintainer: Debian Zsh Maintainers <pkg-zsh-de...@lists.alioth.debian.org>
Changed-By: Axel Beckert <a...@debian.org>
Description:
zsh - shell with lots of features
zsh-beta - transitional package to zsh
zsh-beta-doc - transitional package to zsh-doc
zsh-common - architecture independent files for Zsh
zsh-dbg - shell with lots of features (debugging symbols)
zsh-dev - shell with lots of features (development files)
zsh-doc - zsh documentation - info/HTML format
zsh-static - shell with lots of features (static link)
Closes: 768241 768937
Changes:
zsh (5.0.7-4) unstable; urgency=medium
.
[ Simon McVittie ]
* [991d536c] Make zsh source package binNMU-safe (Closes: #768937)
+ Do not use dh_installdocs --link-doc=zsh-common in
architecture-dependent packages
+ Symlink zsh-common documentation files into /usr/share/doc/zsh
+ Migrate /usr/share/doc/zsh and /usr/share/doc/zsh-dev from symlink
to directory using dpkg-maintscript-helper
.
[ Axel Beckert ]
* [7b632623] Simplify Simon's patch by making /usr/share/doc/zsh/doc a
symlink to ../zsh-common/ in the zsh binary package. Avoids unpack
errors probably caused by having _two_ binary packages containing the
directory which was previously a symlink. (See the log of #768937.)
* [0e03e623,ad143a67] Add Pre-Depends: ${misc:Pre-Depends} for using
dpkg-maintscript-helper's symlink_to_dir.
* [af8ab9de] Also remove zsh4 alternative for rzsh (Closes: #768241)
* [353e05ab] Add a post-jessie TODO list to the source package
Checksums-Sha1:
3f885c3870a1a625ef0746569cf7f014a3204bd1 1987 zsh_5.0.7-4.dsc
c77d5ac1db1a637e88437cd721cd1e178855784b 72776 zsh_5.0.7-4.debian.tar.xz
e63ebfb1245a4aa57fa27e96fcc933193b03a331 3122076 zsh-common_5.0.7-4_all.deb
7d379287c2e2cd44c3c26606f296068a07bf51e1 2466060 zsh-doc_5.0.7-4_all.deb
4d91c406ae91dc539a52d424e87124f73585664c 1540 zsh-beta_5.0.7-4_all.deb
5cce9e1a2d55ae50415f84583eebfae1838f2132 1172 zsh-beta-doc_5.0.7-4_all.deb
eb2a07231d17dc0cccb006b8155735e93b384c46 699818 zsh_5.0.7-4_amd64.deb
48b83002cb5e846d0249d338174cb8affa28255f 935852 zsh-static_5.0.7-4_amd64.deb
c39be076b74643e3ac9c52543bd6d29bd730b78a 121900 zsh-dev_5.0.7-4_amd64.deb
fad75d6656a3441873ff2ec508c91604f24f60fd 1451428 zsh-dbg_5.0.7-4_amd64.deb
Checksums-Sha256:
1757c1774678217fe1408a4e43e9cb0efe74fe93fb62f9a198219202f29b7235 1987
zsh_5.0.7-4.dsc
dfc715c71026ebc7997dbdf69c7ce1b7799208069e1010a18df47efd905d26b6 72776
zsh_5.0.7-4.debian.tar.xz
624678b028362ae0c038cb8c7f4b9d9e9bbf3a359c0f47bac122cce1c4fa6435 3122076
zsh-common_5.0.7-4_all.deb
5d74e80686d54827e27f8ac80437e76b1f208468524f278cf1a3fa92cd946a99 2466060
zsh-doc_5.0.7-4_all.deb
dfc5418cfb8f6b93b5021a35c1744502769ce3578cbd7b3643d794dcc4f4eabf 1540
zsh-beta_5.0.7-4_all.deb
7488f13bf26f49d3a2ef8c08380c7773be499b920f8ea5b2b39abf21b93ed5c6 1172
zsh-beta-doc_5.0.7-4_all.deb
f9921e2eedc67c563966195e5c0b0d204b02d2e433537ba1567662660e00b876 699818
zsh_5.0.7-4_amd64.deb
09575c681c0ec805304982fff26dcd18cc40eab13bca88b9ebebdf2f9ae691b0 935852
zsh-static_5.0.7-4_amd64.deb
8a813935aef8d79e664261078580d0c86c780d40bdf6268d88b32bd07756fd61 121900
zsh-dev_5.0.7-4_amd64.deb
317d62b22bda24f669ee4e54a41aaa1615efd7bfeca45c07ae504675680b9978 1451428
zsh-dbg_5.0.7-4_amd64.deb
Files:
0982251ced95bfe558399c226a698e26 1987 shells optional zsh_5.0.7-4.dsc
03be7ddf407653e777da89cf0fcacfe9 72776 shells optional
zsh_5.0.7-4.debian.tar.xz
4f2446699666d4f254c475ea8a246d84 3122076 shells optional
zsh-common_5.0.7-4_all.deb
634f9df0e58c1b40dfb59a27c2c504a7 2466060 doc optional zsh-doc_5.0.7-4_all.deb
8c04a799b9c571239c3e7fb1425887e1 1540 oldlibs extra zsh-beta_5.0.7-4_all.deb
078a1b4ac84bcb552655afcf66563b33 1172 oldlibs extra
zsh-beta-doc_5.0.7-4_all.deb
1436e1f4428d6b8efae518acc43e4390 699818 shells optional zsh_5.0.7-4_amd64.deb
9f07fe579cfc148fa4ed9eb2e3af6ec4 935852 shells optional
zsh-static_5.0.7-4_amd64.deb
0959396332352587babd135ff44cf64b 121900 libdevel optional
zsh-dev_5.0.7-4_amd64.deb
4b691116c6b0a8f4d2e2e135e07f317c 1451428 debug extra zsh-dbg_5.0.7-4_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlRj+78ACgkQwJ4diZWTDt5ENQCbBMYVuCspYDiCU+KdsJZS8hEB
O48Amwba3W8yQpJ/bZtv/vG4YOU/3dTR
=PymY
-----END PGP SIGNATURE-----
--- End Message ---
