Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock X-Debbugs-Cc: 1035...@bugs.debian.org, j...@packages.debian.org Control: affects -1 + src:jed
Please unblock package jed. The version in unstable fixes the RC bug #1035839. I introduced a regression in the d/jed-common.preinst script when I tried to fix Bug#1035780. I am attaching to this message the debdiff between versions 0.99.20~pre.178+dfsg-1 and -4. The debian/changelog is pretty large, because some changes for version -2 (in an attempt to fix Bug#1035692 that caused Bug#1035780) where canceled in version -3. The final difference is quite small: one line removed from debian/rules, one line removed from debian/jed-common.links, and a new small file added (debian/jed-common.preinst). unblock jed/0.99.20~pre.178+dfsg-4 Best, Rafael Laboissière
diff -Nru jed-0.99.20~pre.178+dfsg/debian/changelog jed-0.99.20~pre.178+dfsg/debian/changelog --- jed-0.99.20~pre.178+dfsg/debian/changelog 2023-01-10 15:10:00.000000000 -0300 +++ jed-0.99.20~pre.178+dfsg/debian/changelog 2023-05-10 01:20:42.000000000 -0300 @@ -1,3 +1,45 @@ +jed (1:0.99.20~pre.178+dfsg-4) unstable; urgency=medium + + * d/jed-common.preinst: Avoid non-fatal abortion of the script. + Thanks to Axel Beckert for the fix (Closes: #1035839) + + -- Rafael Laboissière <raf...@debian.org> Wed, 10 May 2023 01:20:42 -0300 + +jed (1:0.99.20~pre.178+dfsg-3) unstable; urgency=medium + + * Fix upgrade of jed-common (closes: #1035780) + + The previous version, which tried to fix Bug#1035692, messed up + with the directory /usr/share/doc/jed-common/txt. This directory + is not really needed and has been removed, with all filesit + contained being kept in /usr/share/jed/doc/txt/. This version + should allow a smooth transition of jed-common from both bullseye + (version 0.99.19-8) and testing (version 0.99.20~pre.178+dfsg-1) + into bookworm. + + + d/clean: Restore previous version + + d/jed-common.links: Reintroduce this file (for symlink etc/jed.d/README) + + d/jed-common.maintscript: Remove file + + d/rules: Keep files in /usr/share/jed/doc/txt + + d/jed-common.preinst: Remove obsolete directory + /usr/share/doc/jed-common/txt + + -- Rafael Laboissière <raf...@debian.org> Tue, 09 May 2023 08:42:07 -0300 + +jed (1:0.99.20~pre.178+dfsg-2) unstable; urgency=medium + + * Avoid installing the *.txt help file over a directory symlink + (closes: #1035692) + + d/jed-common.maintscript: Add symlink_to_dir command for the + directory /usr/share/jed/doc/txt + + d/jed-common.links: Removed file + + d/rules: Create file d/jed-common.links by adding individual + symbolic links /usr/share/jed/doc/txt/*.txt point to the files in + /usr/share/doc/jed-common/txt/ + + d/clean: Remove the file d/jed-common.links + + -- Rafael Laboissière <raf...@debian.org> Mon, 08 May 2023 12:19:26 -0300 + jed (1:0.99.20~pre.178+dfsg-1) unstable; urgency=medium * New upstream version 0.99.20~pre.178+dfsg diff -Nru jed-0.99.20~pre.178+dfsg/debian/jed-common.links jed-0.99.20~pre.178+dfsg/debian/jed-common.links --- jed-0.99.20~pre.178+dfsg/debian/jed-common.links 2023-01-10 15:10:00.000000000 -0300 +++ jed-0.99.20~pre.178+dfsg/debian/jed-common.links 2023-05-09 08:31:49.000000000 -0300 @@ -1,2 +1 @@ usr/share/doc/jed-common/README.Debian-startup etc/jed.d/README -usr/share/doc/jed-common/txt usr/share/jed/doc/txt diff -Nru jed-0.99.20~pre.178+dfsg/debian/jed-common.preinst jed-0.99.20~pre.178+dfsg/debian/jed-common.preinst --- jed-0.99.20~pre.178+dfsg/debian/jed-common.preinst 1969-12-31 21:00:00.000000000 -0300 +++ jed-0.99.20~pre.178+dfsg/debian/jed-common.preinst 2023-05-10 01:20:12.000000000 -0300 @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +# Remove obsolete txt directory +txtdir=/usr/share/doc/jed-common/txt +if [ -d $txtdir ] ; then + rm -rf $txtdir +fi + +#DEBHELPER# diff -Nru jed-0.99.20~pre.178+dfsg/debian/rules jed-0.99.20~pre.178+dfsg/debian/rules --- jed-0.99.20~pre.178+dfsg/debian/rules 2023-01-10 15:10:00.000000000 -0300 +++ jed-0.99.20~pre.178+dfsg/debian/rules 2023-05-09 08:31:49.000000000 -0300 @@ -83,7 +83,6 @@ execute_after_dh_installdocs-indep: # Fix package-contains-documentation-outside-usr-share-doc - mv $(docdir)/txt $(shrdir)/doc/jed-common rm -f $(jeddir)/lib/colors/README override_dh_compress: