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

Bug#965794: python-ooolib: Removal of obsolete debhelper compat 5 and 6 in bookworm



Note: The absolute minimum change to fix the FTBFS problem is to raise
debian/compat from 5 to 7.

However, it is possible to raise it from 5 to 11 without changing anything else,
and the package is still functionally equivalent.

When using compat 12 there are things in debian/rules that would have to be
changed as well, those can be fixed after the release of bookworm.

I attach the proposed diff (for this bug) and also the output from
diffoscope when applying such change, where it can be seen that the
generated package is still "equivalent" and none of the changes is really
significant.

Thanks.
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+11
--- old/python3-ooolib_0.0.22-5_all.deb
+++ python3-ooolib_0.0.22-5_all.deb
├── file list
│ @@ -1,3 +1,3 @@
│  -rw-r--r--   0        0        0        4 2019-09-15 19:10:44.000000 debian-binary
│ --rw-r--r--   0        0        0     1452 2019-09-15 19:10:44.000000 control.tar.xz
│ --rw-r--r--   0        0        0    20212 2019-09-15 19:10:44.000000 data.tar.xz
│ +-rw-r--r--   0        0        0     1428 2019-09-15 19:10:44.000000 control.tar.xz
│ +-rw-r--r--   0        0        0    19864 2019-09-15 19:10:44.000000 data.tar.xz
├── control.tar.xz
│ ├── control.tar
│ │ ├── file list
│ │ │ @@ -1,5 +1,5 @@
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2019-09-15 19:10:44.000000 ./
│ │ │  -rw-r--r--   0 root         (0) root         (0)      490 2019-09-15 19:10:44.000000 ./control
│ │ │  -rw-r--r--   0 root         (0) root         (0)     1651 2019-09-15 19:10:44.000000 ./md5sums
│ │ │ --rwxr-xr-x   0 root         (0) root         (0)      253 2019-09-15 19:10:44.000000 ./postinst
│ │ │ --rwxr-xr-x   0 root         (0) root         (0)      402 2019-09-15 19:10:44.000000 ./prerm
│ │ │ +-rwxr-xr-x   0 root         (0) root         (0)      263 2019-09-15 19:10:44.000000 ./postinst
│ │ │ +-rwxr-xr-x   0 root         (0) root         (0)      376 2019-09-15 19:10:44.000000 ./prerm
│ │ ├── ./md5sums
│ │ │ ├── ./md5sums
│ │ │ │┄ Files differ
│ │ ├── ./postinst
│ │ │ @@ -1,12 +1,12 @@
│ │ │  #!/bin/sh
│ │ │  set -e
│ │ │  
│ │ │  # Automatically added by dh_python3
│ │ │ -if which py3compile >/dev/null 2>&1; then
│ │ │ +if command -v py3compile >/dev/null 2>&1; then
│ │ │  	py3compile -p python3-ooolib 
│ │ │  fi
│ │ │ -if which pypy3compile >/dev/null 2>&1; then
│ │ │ +if command -v pypy3compile >/dev/null 2>&1; then
│ │ │  	pypy3compile -p python3-ooolib  || true
│ │ │  fi
│ │ │  
│ │ │  # End automatically added section
│ │ ├── ./prerm
│ │ │ @@ -1,12 +1,12 @@
│ │ │  #!/bin/sh
│ │ │  set -e
│ │ │  
│ │ │  # Automatically added by dh_python3
│ │ │ -if which py3clean >/dev/null 2>&1; then
│ │ │ +if command -v py3clean >/dev/null 2>&1; then
│ │ │  	py3clean -p python3-ooolib 
│ │ │  else
│ │ │ -	dpkg -L python3-ooolib | perl -ne 's,/([^/]*)\.py$,/__pycache__/\1.*, or next; unlink $_ or die $! foreach glob($_)'
│ │ │ +	dpkg -L python3-ooolib | sed -En -e '/^(.*)\/(.+)\.py$/s,,rm "\1/__pycache__/\2".*,e'
│ │ │  	find /usr/lib/python3/dist-packages/ -type d -name __pycache__ -empty -print0 | xargs --null --no-run-if-empty rmdir
│ │ │  fi
│ │ │  
│ │ │  # End automatically added section
├── data.tar.xz
│ ├── data.tar
│ │ ├── file list
│ │ │ @@ -10,15 +10,15 @@
│ │ │  -rw-r--r--   0 root         (0) root         (0)     8222 2018-01-08 09:48:31.000000 ./usr/lib/python3/dist-packages/ooolib/tests/test_calc_cell.py
│ │ │  -rw-r--r--   0 root         (0) root         (0)      234 2018-01-08 09:48:31.000000 ./usr/lib/python3/dist-packages/ooolib/tests/utils.py
│ │ │  -rw-r--r--   0 root         (0) root         (0)      289 2019-09-15 19:10:44.000000 ./usr/lib/python3/dist-packages/ooolib_python-0.0.21.egg-info
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2019-09-15 19:10:44.000000 ./usr/share/
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2019-09-15 19:10:44.000000 ./usr/share/doc/
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2019-09-15 19:10:44.000000 ./usr/share/doc/python3-ooolib/
│ │ │  -rw-r--r--   0 root         (0) root         (0)     1341 2018-01-08 09:48:31.000000 ./usr/share/doc/python3-ooolib/README
│ │ │ --rw-r--r--   0 root         (0) root         (0)      870 2019-09-15 19:10:44.000000 ./usr/share/doc/python3-ooolib/changelog.Debian.gz
│ │ │ +-rw-r--r--   0 root         (0) root         (0)      531 2019-09-15 19:10:44.000000 ./usr/share/doc/python3-ooolib/changelog.Debian.gz
│ │ │  -rw-r--r--   0 root         (0) root         (0)     1418 2018-01-08 09:48:31.000000 ./usr/share/doc/python3-ooolib/changelog.gz
│ │ │  -rw-r--r--   0 root         (0) root         (0)      600 2019-09-15 19:10:44.000000 ./usr/share/doc/python3-ooolib/copyright
│ │ │  drwxr-xr-x   0 root         (0) root         (0)        0 2019-09-15 19:10:44.000000 ./usr/share/doc/python3-ooolib/examples/
│ │ │  -rw-r--r--   0 root         (0) root         (0)      491 2018-01-08 09:48:31.000000 ./usr/share/doc/python3-ooolib/examples/calc-example01.py
│ │ │  -rw-r--r--   0 root         (0) root         (0)      796 2018-01-08 09:48:31.000000 ./usr/share/doc/python3-ooolib/examples/calc-example02.py
│ │ │  -rw-r--r--   0 root         (0) root         (0)     1044 2018-01-08 09:48:31.000000 ./usr/share/doc/python3-ooolib/examples/calc-example03.py
│ │ │  -rw-r--r--   0 root         (0) root         (0)      645 2018-01-08 09:48:31.000000 ./usr/share/doc/python3-ooolib/examples/calc-example04.py
│ │ ├── ./usr/share/doc/python3-ooolib/changelog.Debian.gz
│ │ │ ├── changelog.Debian
│ │ │ │ @@ -32,70 +32,9 @@
│ │ │ │      - supports python3
│ │ │ │  
│ │ │ │    * debian/rules, debian/control: build python3-ooolib instead of
│ │ │ │      python-ooolib (closes: #937190)
│ │ │ │  
│ │ │ │   -- Rene Engelhard <rene@debian.org>  Fri, 30 Aug 2019 20:40:04 +0200
│ │ │ │  
│ │ │ │ -ooolib-python (0.0.17-2.1) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * Non-maintainer upload.
│ │ │ │ -  * Rebuild to add Python 2.7 support
│ │ │ │ -
│ │ │ │ - -- Piotr Ożarowski <piotr@debian.org>  Sun, 08 May 2011 16:46:01 +0200
│ │ │ │ -
│ │ │ │ -ooolib-python (0.0.17-2) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * move to LibreOffice Maintainers
│ │ │ │ -  * build with dh_python2 (closes: #616924) 
│ │ │ │ -
│ │ │ │ - -- Rene Engelhard <rene@debian.org>  Tue, 08 Mar 2011 18:34:55 +0100
│ │ │ │ -
│ │ │ │ -ooolib-python (0.0.17-1) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * New upstream release (closes: #564590)
│ │ │ │ -
│ │ │ │ - -- Rene Engelhard <rene@debian.org>  Thu, 28 Jan 2010 22:41:33 +0100
│ │ │ │ -
│ │ │ │ -ooolib-python (0.0.16-1) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * New upstream release
│ │ │ │ -    - fixes handling of "" in formulas (closes: #492582)
│ │ │ │ -
│ │ │ │ - -- Rene Engelhard <rene@debian.org>  Sun, 03 Aug 2008 15:26:43 +0200
│ │ │ │ -
│ │ │ │ -ooolib-python (0.0.13-1) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * New upstream release
│ │ │ │ -
│ │ │ │ - -- Rene Engelhard <rene@debian.org>  Fri, 06 Jun 2008 09:55:17 +0200
│ │ │ │ -
│ │ │ │ -ooolib-python (0.0.11-1) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * New upstream release
│ │ │ │ -
│ │ │ │ - -- Rene Engelhard <rene@debian.org>  Fri, 19 Oct 2007 16:11:40 +0200
│ │ │ │ -
│ │ │ │ -ooolib-python (0.0.9-1) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * New upstream release
│ │ │ │ -
│ │ │ │ - -- Rene Engelhard <rene@debian.org>  Wed, 04 Jul 2007 19:11:21 +0200
│ │ │ │ -
│ │ │ │ -ooolib-python (0.0.8-3) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * another typo (closes: #419977)
│ │ │ │ -
│ │ │ │ - -- Rene Engelhard <rene@debian.org>  Thu, 19 Apr 2007 17:46:32 +0200
│ │ │ │ -
│ │ │ │ -ooolib-python (0.0.8-2) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * fix typo in package description (closes: #418512) 
│ │ │ │ -
│ │ │ │ - -- Rene Engelhard <rene@debian.org>  Wed, 11 Apr 2007 16:37:09 +0200
│ │ │ │ -
│ │ │ │ -ooolib-python (0.0.8-1) unstable; urgency=low
│ │ │ │ -
│ │ │ │ -  * Initial release
│ │ │ │ -
│ │ │ │ - -- Rene Engelhard <rene@debian.org>  Wed, 21 Feb 2007 10:47:47 +0100
│ │ │ │ -
│ │ │ │ +# Older entries have been removed from this changelog.
│ │ │ │ +# To read the complete changelog use `apt changelog python3-ooolib`.
│ │ │ │ ├── encoding
│ │ │ │ │ @@ -1 +1 @@
│ │ │ │ │ -utf-8
│ │ │ │ │ +us-ascii

Reply to: