On Fri, Aug 30, 2019 at 11:12:35AM +0200, Andreas Henriksson wrote:
> Hello,
>
> On Fri, Aug 30, 2019 at 07:27:53AM +0000, Matthias Klose wrote:
> > Package: src:nautilus-python
> [...]
> > Usertags: py2removal
> [...]
> > - Convert your Package to Python3.
> [...]
>
> There are already useful discussions about this in #911082 (also see the
> salsa MR referenced in there that can serve as a help to get started).
>
> The main blocker for this has been checking how it affects all reverse
> dependencies (see if they work with python3), but at this point I guess
> the switch should just happen and any broken rdeps should simply get an
> RC bug.
This is good to go now, there's only one reverse dependency left
(owncloud-client),
but it's RC-buggy and dropped from testing since August 2019. (And two
packages which set a Suggests only).
Patch attached.
Cheers,
Moritz
diff -Naur nautilus-python-1.2.3.orig/debian/control nautilus-python-1.2.3/debian/control
--- nautilus-python-1.2.3.orig/debian/control.in 2019-11-19 01:21:40.000000000 +0100
+++ nautilus-python-1.2.3/debian/control.in 2020-04-24 14:43:36.766130701 +0200
@@ -11,9 +11,7 @@
dh-python,
gnome-pkg-tools,
pkg-config,
- python-dev,
python-gi-dev,
- python-gi,
python3-dev,
python3-gi,
libnautilus-extension-dev (>= 3.0)
@@ -21,20 +19,6 @@
Vcs-Browser: https://salsa.debian.org/gnome-team/nautilus-python
Vcs-Git: https://salsa.debian.org/gnome-team/nautilus-python.git
-Package: python-nautilus
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${python:Depends},
- python-gi (>= 3.0),
- gir1.2-nautilus-3.0
-Conflicts: python3-nautilus
-Description: Python binding for Nautilus components (DEPRECATED Python 2 version)
- Python binding for Nautilus, to allow Nautilus property page and menu item
- extensions to be written in Python.
- .
- This package contains the DEPRECATED Python 2 version of the library.
-
Package: python3-nautilus
Architecture: any
Depends: ${shlibs:Depends},
diff -Naur nautilus-python-1.2.3.orig/debian/python-nautilus.dirs nautilus-python-1.2.3/debian/python-nautilus.dirs
--- nautilus-python-1.2.3.orig/debian/python-nautilus.dirs 2019-11-19 01:21:40.000000000 +0100
+++ nautilus-python-1.2.3/debian/python-nautilus.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/nautilus-python/extensions
diff -Naur nautilus-python-1.2.3.orig/debian/python-nautilus.docs nautilus-python-1.2.3/debian/python-nautilus.docs
--- nautilus-python-1.2.3.orig/debian/python-nautilus.docs 2019-11-19 01:21:40.000000000 +0100
+++ nautilus-python-1.2.3/debian/python-nautilus.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-AUTHORS
-NEWS
-README
diff -Naur nautilus-python-1.2.3.orig/debian/python-nautilus.lintian-overrides nautilus-python-1.2.3/debian/python-nautilus.lintian-overrides
--- nautilus-python-1.2.3.orig/debian/python-nautilus.lintian-overrides 2019-11-19 01:21:40.000000000 +0100
+++ nautilus-python-1.2.3/debian/python-nautilus.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-# System-wide directory where extensions must be added
-python-nautilus: package-contains-empty-directory usr/share/nautilus-python/extensions/
diff -Naur nautilus-python-1.2.3.orig/debian/rules nautilus-python-1.2.3/debian/rules
--- nautilus-python-1.2.3.orig/debian/rules 2019-11-19 01:21:40.000000000 +0100
+++ nautilus-python-1.2.3/debian/rules 2020-04-24 14:43:15.321791043 +0200
@@ -4,33 +4,19 @@
export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,--as-needed
%:
- dh $@ --with gnome,python2,python3
+ dh $@ --with gnome,python3
override_dh_auto_configure:
- # configure for Python 2
- PYTHON_VERSION="$(shell pyversions -vd)" PYTHON="$(shell pyversions -d)" \
- dh_auto_configure --builddirectory=debian/python-nautilus-build
- # configure for Python 3
PYTHON_VERSION="$(shell py3versions -vd)" PYTHON="$(shell py3versions -d)" \
dh_auto_configure --builddirectory=debian/python3-nautilus-build
override_dh_auto_build:
- # build for Python 2
- PYTHON_VERSION="$(shell pyversions -vd)" PYTHON="$(shell pyversions -d)" \
- dh_auto_build --builddirectory=debian/python-nautilus-build
- # build for Python 3
PYTHON_VERSION="$(shell py3versions -vd)" PYTHON="$(shell py3versions -d)" \
dh_auto_build --builddirectory=debian/python3-nautilus-build
override_dh_auto_install:
- # install for Python 2
- dh_auto_install --destdir="$(CURDIR)/debian/python-nautilus" --builddirectory=debian/python-nautilus-build
- # install for Python 3
dh_auto_install --destdir="$(CURDIR)/debian/python3-nautilus" --builddirectory=debian/python3-nautilus-build
-override_dh_python2:
- dh_python2 -p python-nautilus
-
override_dh_python3:
dh_python3 -p python3-nautilus
@@ -40,12 +26,10 @@
override_dh_install:
dh_install
rm -rf debian/python-nautilus/usr/share/doc/nautilus-python/
- rm -f debian/python-nautilus/usr/lib/*/nautilus/extensions-3.0/*.la
rm -f debian/python3-nautilus/usr/lib/*/nautilus/extensions-3.0/*.la
override_dh_installexamples:
dh_installexamples -A examples/*.py examples/README
override_dh_makeshlibs:
- dh_makeshlibs -ppython-nautilus --no-act
dh_makeshlibs -ppython3-nautilus --no-act
