On Thu, May 25, 2023 at 09:52:55PM +0200, Gürkan Myczko wrote:
> On 25.05.2023 19:47, Martin Hostettler wrote:
> > On 19/05/2023 12.48, Martin Hostettler wrote:
> > > It seems what is needed is this:
> > > 
> > >     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
> > > 
> > > (The wildcards are used to avoid hard coding the current debian
> > > default
> > > python version)
> > 
> > Any chance to get this changes into an upload? The deadline for last
> > unblock requests is quickly coming.
> 
> I'm sorry, I'm busy with other things, if you feel like it please go ahead
> add yourself to
> Uploaders and upload. Or NMU, as you like. I am also fine reviewing changes,
> and uploading
> via mentors.d.n.
> 

I don't have a gpg key, so i think mentors.d.n is not an option but i
uploaded to some temporary web location. So feel free to review from there.
Also feel free to do what makes the most sense to you with the changelog
entry and version.

https://uchuujin.de/tmp/cadabra/cadabra2_2.4.3.2-0.2.dsc

I'm also attaching the intended patch, in case that is easier to review.

 - Martin
diff -ru orig/cadabra2-2.4.3.2/debian/changelog patched/cadabra2-2.4.3.2/debian/changelog
--- orig/cadabra2-2.4.3.2/debian/changelog	2023-02-06 22:21:08.000000000 +0000
+++ patched/cadabra2-2.4.3.2/debian/changelog	2023-05-26 18:17:02.306980093 +0000
@@ -1,3 +1,13 @@
+cadabra2 (2.4.3.2-0.2) 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-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -ru orig/cadabra2-2.4.3.2/debian/rules patched/cadabra2-2.4.3.2/debian/rules
--- orig/cadabra2-2.4.3.2/debian/rules	2022-10-13 07:06:04.000000000 +0000
+++ patched/cadabra2-2.4.3.2/debian/rules	2023-05-26 06:41:08.613257764 +0000
@@ -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

Reply via email to