On Fri, May 19, 2023 at 11:09:41AM +0200, Helmut Grohne wrote:
> On Fri, May 19, 2023 at 10:27:46AM +0200, Martin Hostettler wrote:
> 
> Do I understand correctly that all we have to do here is ship the file
> in its "canonical" path after resolving the symbolic link from
> python3-notebook? In other words, a simple file move in the data.tar?

If dpkg can handle that even with the symlink, then i think, yes.

> 
> > I have no clue how the correct way to make this switch in the debian
> > packaging is, but i hope this messages helps to confirm what is happening
> > in this situation and someone with more solid clue about these kind of
> > problems in packaging can resolve this.
> 
> It is as simple as adding a mv invocation to an
> appropriate override_dh_something to debian/rules. That's something that
> easily passes an unblock request with the release team.
> 
> Probably, appending to override_dh_auto_install is sufficient:
> 
>     mv 
> debian/cadabra2/usr/lib/python3/dist-packages/notebook/static/components 
> debian/cadabra2/usr/lib/share/javascript
>     rmdir debian/cadabra2/usr/lib/python3/dist-packages/notebook/static
>     rmdir debian/cadabra2/usr/lib/python3/dist-packages/notebook
> 

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)

That results in a debdiff like this:
 
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


Which looks ok.

both before the patch and after the following file exists when
python3-notebook was installed before installing cadabra:

/usr/share/javascript/codemirror/mode/cadabra/cadabra.js


I just noticed that the override_dh_auto_install also contains a line not
yet updated to python 3.11

> sed -i s,python3.10,python3,g debian/cadabra2/usr/bin/cadabra2

Updateing that might be a good idea too. Switching that to 3.11 results in
the further debdiff:

Control files: lines which differ (wdiff format)
------------------------------------------------
Depends: fonts-cmu, python3 (<< 3.12), python3 (>= 3.11~), [-python3.11:any,-] 
python3:any (>= 3.6~)

Which seems ok too.

@G�rkan Myczko

Could you see if that seems sane and if it is do an upload with the moved
file? (I'm not a DD, so i can't help out with that)

 - Martin

Reply via email to