Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: Martin Hostettler <textsh...@uchuujin.de>
Control: affects -1 + src:cadabra2
Please unblock package cadabra2
[ Reason ]
This is a rare case (i.e. only a single occurence in sid) of a
directory vs. symlink conflict: two different packages in a release
ship a path as either directory (containing files) or symlink.
(The typical case is where such a conflict happens is within the same
package on upgrades between releases if dpkg-maintscript-helper
dir_to_symlink/symlink_to_dir was forgotten.)
What ends up in the file system depends on the installation order of
cadabra2 and python3-notebook ...
This is fixed in cadabra2 by shipping the file in question directly in
the canonical location (i.e. where the symlink in python3-notebook
points to.).
[ Impact ]
Depending on the installation order
/usr/lib/python3/dist-packages/notebook/static/components/codemirror may
be
a) (the good case) a symlink to /usr/share/javascript/codemirror
containing a lot of javascript code or
b) (the bad case) a (nearly) empty directory, making python3-notebook
lose functionality
[ Tests ]
manual upgrade tests and debdiff inspection
[ Risks ]
It may well be that python3-notebook still needs some
Breaks: cadabra2 (<< 2.4.3.2-1.1~)
and
dpkg-maintscript-helper dir_to_symlink
to recover from bad installation order before the packages were fixed.
But making cadabra2 use the canonical location is mandatory for any
followup fixes.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
The effective binary debdiff is
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .deb but not in first
-------------------------------------
-rw-r--r-- root/root /usr/share/javascript/codemirror/mode/cadabra/cadabra.js
Files in first .deb but not in second
-------------------------------------
-rw-r--r-- root/root
/usr/lib/python3/dist-packages/notebook/static/components/codemirror/mode/cadabra/cadabra.js
Control files: lines which differ (wdiff format)
------------------------------------------------
Installed-Size: [-14644-] {+14642+}
Version: [-2.4.3.2-0.1-] {+2.4.3.2-1.1+}
unblock cadabra2/2.4.3.2-1.1
Andreas
diff -Nru cadabra2-2.4.3.2/debian/changelog cadabra2-2.4.3.2/debian/changelog
--- cadabra2-2.4.3.2/debian/changelog 2023-02-06 23:21:08.000000000 +0100
+++ cadabra2-2.4.3.2/debian/changelog 2023-05-26 08:41:29.000000000 +0200
@@ -1,3 +1,21 @@
+cadabra2 (2.4.3.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Move codemirror integration to canonical path to
+ avoid symlink/directory conflict on
+ /usr/lib/python3/dist-packages/notebook/static/components/codemirror
+ (Closes: 1036021)
+
+ -- Martin Hostettler <textsh...@uchuujin.de> Fri, 26 May 2023 06:41:29 +0000
+
+cadabra2 (2.4.3.2-1) experimental; urgency=medium
+
+ * d/control: Update Vcs fields.
+ * Bump standards version to 4.6.2.
+ * Acknowledge NMU, thanks to Adrian Bunk.
+
+ -- Gürkan Myczko <t...@debian.org> Thu, 30 Mar 2023 11:44:14 +0200
+
cadabra2 (2.4.3.2-0.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru cadabra2-2.4.3.2/debian/control cadabra2-2.4.3.2/debian/control
--- cadabra2-2.4.3.2/debian/control 2022-08-14 20:25:58.000000000 +0200
+++ cadabra2-2.4.3.2/debian/control 2023-03-30 11:44:14.000000000 +0200
@@ -25,9 +25,9 @@
uuid-dev,
X-Python3-Version: >= 3.6
Rules-Requires-Root: no
-Standards-Version: 4.6.1
-Vcs-Git: https://salsa.debian.org/myczko-guest/cadabra2.git
-Vcs-Browser: https://salsa.debian.org/myczko-guest/cadabra2
+Standards-Version: 4.6.2
+Vcs-Git: https://salsa.debian.org/debian/cadabra2.git
+Vcs-Browser: https://salsa.debian.org/debian/cadabra2
Homepage: https://cadabra.science/
Package: cadabra2
diff -Nru cadabra2-2.4.3.2/debian/rules cadabra2-2.4.3.2/debian/rules
--- cadabra2-2.4.3.2/debian/rules 2022-10-13 09:06:04.000000000 +0200
+++ cadabra2-2.4.3.2/debian/rules 2023-05-26 08:41:29.000000000 +0200
@@ -27,6 +27,9 @@
dh_auto_install
sed -i s,python3.10,python3,g debian/cadabra2/usr/bin/cadabra2
sed -i s,site-,dist-,g debian/cadabra2/usr/bin/cadabra2
+ mv
debian/cadabra2/usr/lib/python3.*/site-packages/notebook/static/components
debian/cadabra2/usr/share/javascript
+ rmdir debian/cadabra2/usr/lib/python3.*/site-packages/notebook/static
+ rmdir debian/cadabra2/usr/lib/python3.*/site-packages/notebook
override_dh_shlibdeps:
@echo test
