[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1035825: marked as done (unblock: jed/0.99.20~pre.178+dfsg-3)

Your message dated Thu, 11 May 2023 11:00:52 +0200
with message-id <ZFyuxOw9ThvlLoX7@ramacher.at>
and subject line Re: Bug#1035825: unblock: jed/0.99.20~pre.178+dfsg-3
has caused the Debian Bug report #1035825,
regarding unblock: jed/0.99.20~pre.178+dfsg-3
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 owner@bugs.debian.org
immediately.)


-- 
1035825: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1035825
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: 1035780@bugs.debian.org, 1035692@bugs.debian.org, jed@packages.debian.org
Control: affects -1 + src:jed
Content-Language: en-us

Please unblock package jed.

The version in unstable fixes two RC bugs that have been recently filed 
against the jed package, triggered by piuparts (Bug#1035692 and 
Bug#1035780). The version of the package now in unstable passes piuparts 
[1] and transitions smoothly from both bullseye (version 0.99.19-8) and 
testing (0.99.20~pre.178+dfsg-1).

I am attaching to this message the debdiff between versions 
0.99.20~pre.178+dfsg-1 and -3. 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-3

Best,

Rafael Laboissière

[1] https://piuparts.debian.org/testing2sid/pass/jed-common_1:0.99.20~pre.178+dfsg-3.log

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-09 08:42:07.000000000 -0300
@@ -1,3 +1,38 @@
+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 <rafael@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 <rafael@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:42:07.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-09 08:42:07.000000000 -0300
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+# Remove obsolete txt directory
+txtdir=/usr/share/doc/jed-common/txt
+test -d $txtdir && rm -rf $txtdir
+
+#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:42:07.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:

--- End Message ---
--- Begin Message --- 
On 2023-05-09 19:09:56 +0200, Rafael Laboissière wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> X-Debbugs-Cc: 1035780@bugs.debian.org, 1035692@bugs.debian.org, jed@packages.debian.org
> Control: affects -1 + src:jed
> Content-Language: en-us
> 
> Please unblock package jed.
> 
> The version in unstable fixes two RC bugs that have been recently filed 
> against the jed package, triggered by piuparts (Bug#1035692 and 
> Bug#1035780). The version of the package now in unstable passes piuparts 
> [1] and transitions smoothly from both bullseye (version 0.99.19-8) and 
> testing (0.99.20~pre.178+dfsg-1).
> 
> I am attaching to this message the debdiff between versions 
> 0.99.20~pre.178+dfsg-1 and -3. 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-3

Rendered obsolete by the unblock request for -4.

Cheers
-- 
Sebastian Ramacher

--- End Message ---
Reply to: