--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock zsh/5.0.7-4. It fixes the following bugs:
#768937 [S| |=☺] [zsh] [patch] not binNMU-safe due to --link-doc between arch-dep and arch-indep
#769140 [S| |=☺] [zsh] Unable to Install zsh
#768241 [i| | ☺] [zsh] leaves alternatives after purge: /bin/rzsh = /bin/zsh4
(The first two RC-level bug reports were merged. The second issue was
found by piuparts.)
Source debdiff between the version in Testing (5.0.7-3) and the
version in Sid (5.0.7-4):
diff -Nru zsh-5.0.7/debian/TODO.md zsh-5.0.7/debian/TODO.md
--- zsh-5.0.7/debian/TODO.md 1970-01-01 01:00:00.000000000 +0100
+++ zsh-5.0.7/debian/TODO.md 2014-11-08 22:31:00.000000000 +0100
@@ -0,0 +1,14 @@
+Debian Zsh TODO
+===============
+
+After the Jessie-Release
+------------------------
+
+* Remove zsh-beta* packages
+* Remove alternatives system properly
+* Remove zsh4* wrappers
+
+Decisions
+---------
+
+* Do we want to continue providing a static build (zsh-static)?
diff -Nru zsh-5.0.7/debian/changelog zsh-5.0.7/debian/changelog
--- zsh-5.0.7/debian/changelog 2014-10-21 02:41:42.000000000 +0200
+++ zsh-5.0.7/debian/changelog 2014-11-13 01:18:54.000000000 +0100
@@ -1,3 +1,25 @@
+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
+
+ -- Axel Beckert <abe@debian.org> Thu, 13 Nov 2014 01:18:54 +0100
+
zsh (5.0.7-3) unstable; urgency=low
* Upload to unstable again
diff -Nru zsh-5.0.7/debian/control zsh-5.0.7/debian/control
--- zsh-5.0.7/debian/control 2014-10-21 02:33:01.000000000 +0200
+++ zsh-5.0.7/debian/control 2014-11-13 01:16:37.000000000 +0100
@@ -32,6 +32,7 @@
Package: zsh-common
Architecture: all
Depends: ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Replaces: zsh (<= 5.0.2-1)
Recommends: zsh
Suggests: zsh-doc
@@ -52,6 +53,7 @@
Depends: zsh-common (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Recommends: ${shlibs:Recommends}
Suggests: zsh-doc
Description: shell with lots of features
@@ -100,6 +102,7 @@
Architecture: any
Depends: zsh-common (= ${source:Version}),
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Section: libdevel
Description: shell with lots of features (development files)
Zsh is a UNIX command interpreter (shell) usable as an
diff -Nru zsh-5.0.7/debian/rules zsh-5.0.7/debian/rules
--- zsh-5.0.7/debian/rules 2014-10-13 22:55:03.000000000 +0200
+++ zsh-5.0.7/debian/rules 2014-11-12 00:31:08.000000000 +0100
@@ -182,7 +182,8 @@
-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
binary-arch-static: build-static
dh_testdir
@@ -192,7 +193,8 @@
# 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 +217,8 @@
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 -Nru zsh-5.0.7/debian/zsh-common.maintscript zsh-5.0.7/debian/zsh-common.maintscript
--- zsh-5.0.7/debian/zsh-common.maintscript 1970-01-01 01:00:00.000000000 +0100
+++ zsh-5.0.7/debian/zsh-common.maintscript 2014-11-11 01:17:45.000000000 +0100
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/zsh zsh-common 5.0.7-3
diff -Nru zsh-5.0.7/debian/zsh-dev.maintscript zsh-5.0.7/debian/zsh-dev.maintscript
--- zsh-5.0.7/debian/zsh-dev.maintscript 1970-01-01 01:00:00.000000000 +0100
+++ zsh-5.0.7/debian/zsh-dev.maintscript 2014-11-11 01:17:45.000000000 +0100
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/zsh-dev zsh-common 5.0.7-3
diff -Nru zsh-5.0.7/debian/zsh.links zsh-5.0.7/debian/zsh.links
--- zsh-5.0.7/debian/zsh.links 1970-01-01 01:00:00.000000000 +0100
+++ zsh-5.0.7/debian/zsh.links 2014-11-12 00:36:55.000000000 +0100
@@ -0,0 +1,3 @@
+/usr/share/doc/zsh-common/changelog.gz /usr/share/doc/zsh/changelog.gz
+/usr/share/doc/zsh-common/examples /usr/share/doc/zsh/examples
+/usr/share/doc/zsh-common /usr/share/doc/zsh/doc
diff -Nru zsh-5.0.7/debian/zsh.maintscript zsh-5.0.7/debian/zsh.maintscript
--- zsh-5.0.7/debian/zsh.maintscript 1970-01-01 01:00:00.000000000 +0100
+++ zsh-5.0.7/debian/zsh.maintscript 2014-11-11 01:17:45.000000000 +0100
@@ -0,0 +1 @@
+symlink_to_dir /usr/share/doc/zsh zsh-common 5.0.7-3
diff -Nru zsh-5.0.7/debian/zsh.postinst zsh-5.0.7/debian/zsh.postinst
--- zsh-5.0.7/debian/zsh.postinst 2014-10-20 14:03:51.000000000 +0200
+++ zsh-5.0.7/debian/zsh.postinst 2014-11-06 16:31:11.000000000 +0100
@@ -26,6 +26,7 @@
update-alternatives --install /bin/rzsh rzsh /bin/zsh5 51 \
--slave /usr/share/man/man1/rzsh.1.gz rzsh.1.gz /usr/share/man/man1/zsh.1.gz
update-alternatives --remove zsh /bin/zsh4
+update-alternatives --remove rzsh /bin/zsh4
# Replace documentation directory with symlink
docdir="/usr/share/doc/zsh"
Binary debdiff (i.e. debdiff between the two _amd64.changes files):
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .changes but not in first
-----------------------------------------
-rw-r--r-- root/root /usr/share/doc/zsh-dev/NEWS.Debian.gz
-rw-r--r-- root/root /usr/share/doc/zsh-dev/changelog.Debian.gz
-rw-r--r-- root/root /usr/share/doc/zsh-dev/changelog.gz
-rw-r--r-- root/root /usr/share/doc/zsh-dev/copyright
-rw-r--r-- root/root /usr/share/doc/zsh/NEWS.Debian.gz
-rw-r--r-- root/root /usr/share/doc/zsh/changelog.Debian.gz
-rw-r--r-- root/root /usr/share/doc/zsh/changelog.gz
-rw-r--r-- root/root /usr/share/doc/zsh/copyright
lrwxrwxrwx root/root /usr/share/doc/zsh-dbg -> zsh
lrwxrwxrwx root/root /usr/share/doc/zsh/doc -> ../zsh-common
lrwxrwxrwx root/root /usr/share/doc/zsh/examples -> ../zsh-common/examples
Files in first .changes but not in second
-----------------------------------------
lrwxrwxrwx root/root /usr/share/doc/zsh -> zsh-common
lrwxrwxrwx root/root /usr/share/doc/zsh-dbg -> zsh-common
lrwxrwxrwx root/root /usr/share/doc/zsh-dev -> zsh-common
Control files of package zsh: lines which differ (wdiff format)
---------------------------------------------------------------
Depends: zsh-common (= [-5.0.7-3),-] {+5.0.7-4),+} libc6 (>= 2.15), libcap2 (>= 1:2.10), libtinfo5
Installed-Size: [-1891-] {+1976+}
{+Pre-Depends: dpkg (>= 1.17.5)+}
Version: [-5.0.7-3-] {+5.0.7-4+}
Control files of package zsh-beta: lines which differ (wdiff format)
--------------------------------------------------------------------
Depends: zsh (>= 5), zsh-common (= [-5.0.7-3)-] {+5.0.7-4)+}
Version: [-5.0.7-3-] {+5.0.7-4+}
Control files of package zsh-beta-doc: lines which differ (wdiff format)
------------------------------------------------------------------------
Depends: zsh-common (= [-5.0.7-3),-] {+5.0.7-4),+} zsh-doc
Version: [-5.0.7-3-] {+5.0.7-4+}
Control files of package zsh-common: lines which differ (wdiff format)
----------------------------------------------------------------------
Installed-Size: [-10873-] {+10874+}
{+Pre-Depends: dpkg (>= 1.17.5)+}
Version: [-5.0.7-3-] {+5.0.7-4+}
Control files of package zsh-dbg: lines which differ (wdiff format)
-------------------------------------------------------------------
Depends: zsh (= [-5.0.7-3),-] {+5.0.7-4),+} zsh-common (= [-5.0.7-3)-] {+5.0.7-4)+}
Installed-Size: [-1922-] {+1910+}
Version: [-5.0.7-3-] {+5.0.7-4+}
Control files of package zsh-dev: lines which differ (wdiff format)
-------------------------------------------------------------------
Depends: zsh-common (= [-5.0.7-3)-] {+5.0.7-4)+}
Installed-Size: [-221-] {+301+}
{+Pre-Depends: dpkg (>= 1.17.5)+}
Version: [-5.0.7-3-] {+5.0.7-4+}
Control files of package zsh-doc: lines which differ (wdiff format)
-------------------------------------------------------------------
Depends: zsh-common (= [-5.0.7-3)-] {+5.0.7-4)+}
Version: [-5.0.7-3-] {+5.0.7-4+}
Control files of package zsh-static: lines which differ (wdiff format)
----------------------------------------------------------------------
Built-Using: glibc (= [-2.19-11),-] {+2.19-13),+} libcap2 (= 1:2.24-6), ncurses (= 5.9+20140913-1), pcre3 (= [-1:8.35-3.1)-] {+1:8.35-3.2)+}
Version: [-5.0.7-3-] {+5.0.7-4+}
unblock zsh/5.0.7-4
-- System Information:
Debian Release: jessie/sid
APT prefers unstable
APT policy: (990, 'unstable'), (600, 'testing'), (110, 'experimental'), (109, 'buildd-unstable'), (109, 'buildd-experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.17-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- End Message ---