Control: tags -1 + patch

On Tue, 04 Aug 2020 at 09:29:22 +0000, Matthias Klose wrote:
> We will keep some Python2 package as discussed in
> https://lists.debian.org/debian-python/2020/07/msg00039.html
> but removing the unversioned python packages python-minimal, python,
> python-dev, python-dbg, python-doc.

This is RC, and makes telepathy-idle unbuildable in unstable, because
the python package has already been removed. It doesn't seem to be up for
autoremoval yet, perhaps because polari is relatively high-popcon, although
I suspect polari will decline rapidly now that the GNOME metapackages no
longer pull it in.

When uploading (whether maintainer or NMU) to fix this, there are several
easy fixes that can be applied at the same time. I've sent a merge request
https://salsa.debian.org/telepathy-team/telepathy-idle/-/merge_requests/2
(or see attached diff).

Note that I have only build-tested this, because I no longer use
Telepathy, so an -idle user should test it before upload.

    smcv
diff --git a/debian/changelog b/debian/changelog
index 135fab6..b84c678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+telepathy-idle (0.2.0-3) UNRELEASED; urgency=medium
+
+  [ Simon McVittie ]
+  * Remove myself from Uploaders
+  * Update Vcs-Git (Closes: #907465)
+  * Remove Dafydd Harries from Uploaders.
+    Thanks for your past work on this package, Daf! (Closes: #965395)
+  * Explicitly use python2.
+    The unversioned python executable is going away for Debian 11.
+    (Closes: #967217)
+
+  [ Jonny Lamb ]
+  * Remove myself from Uploaders.
+
+ -- Simon McVittie <s...@debian.org>  Fri, 14 Aug 2020 09:20:58 +0100
+
 telepathy-idle (0.2.0-2) unstable; urgency=medium
 
   * debian/watch: don't watch for development or 1.0-branch versions
diff --git a/debian/control b/debian/control
index 7c435a8..efe2c75 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,9 @@ Source: telepathy-idle
 Section: net
 Priority: optional
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintain...@lists.alioth.debian.org>
-Uploaders: Dafydd Harries <d...@debian.org>,
-           Riccardo Setti <gisk...@debian.org>,
-           Simon McVittie <s...@debian.org>,
+Uploaders: Riccardo Setti <gisk...@debian.org>,
            Sjoerd Simons <sjo...@debian.org>,
-           Laurent Bigonville <bi...@debian.org>,
-           Jonny Lamb <jo...@debian.org>
+           Laurent Bigonville <bi...@debian.org>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                dpkg-dev (>= 1.16.1),
@@ -15,11 +12,11 @@ Build-Depends: debhelper (>= 9),
                libdbus-1-dev,
                libdbus-glib-1-dev (>= 0.51),
                libtelepathy-glib-dev (>= 0.22),
-               xsltproc,
-               python
+               python2,
+               xsltproc
 Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/pkg-telepathy/telepathy-idle.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-telepathy/telepathy-idle.git
+Vcs-Git: https://salsa.debian.org/telepathy-team/telepathy-idle.git
+Vcs-Browser: https://salsa.debian.org/telepathy-team/telepathy-idle
 Homepage: http://sourceforge.net/projects/telepathy-idle
 
 Package: telepathy-idle
diff --git a/debian/rules b/debian/rules
index 99456a0..8c440db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ override_dh_auto_configure:
 		--libdir="\$${prefix}/lib" \
 		--libexecdir="\$${libdir}/telepathy" \
 		--disable-static \
+		PYTHON=python2 \
                 $(NULL)
 
 # The regression tests are too prone to race conditions for the buildds,

Reply via email to