Control: tags -1 + patch
On Tue, 04 Aug 2020 at 09:29:23 +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-rakia unbuildable in unstable, because
the python package has already been removed. It is now up for autoremoval
as a result.
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-rakia/-/merge_requests/1
(or see attached diff).
Note that I have only build-tested this, because I no longer use
Telepathy, so a -rakia user should test it before upload.
smcv
diff --git a/debian/changelog b/debian/changelog
index 9f354da..ca502d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+telepathy-rakia (0.8.0-4) UNRELEASED; urgency=medium
+
+ [ Simon McVittie ]
+ * Remove myself from Uploaders
+ * Update Vcs-Git (Closes: #907463)
+ * Remove Dafydd Harries from uploaders.
+ Thanks for your past work on this package, Daf! (Closes: #965399)
+ * Explicitly use python2 for build.
+ The unversioned python executable is going away for Debian 11.
+ (Closes: #967218)
+ * Remove telepathy-sofiasip transitional package (Closes: #878985)
+
+ [ Jonny Lamb ]
+ * Remove myself from Uploaders.
+
+ -- Simon McVittie <s...@debian.org> Fri, 14 Aug 2020 09:41:12 +0100
+
telepathy-rakia (0.8.0-3) unstable; urgency=medium
* debian/watch: only watch for 0.x stable branches
diff --git a/debian/control b/debian/control
index 0a6e31e..0f2b9c9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,9 @@ Source: telepathy-rakia
Section: net
Priority: optional
Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintain...@lists.alioth.debian.org>
-Uploaders: Dafydd Harries <d...@debian.org>,
- Simon McVittie <s...@debian.org>,
- Sjoerd Simons <sjo...@debian.org>,
+Uploaders: Sjoerd Simons <sjo...@debian.org>,
Laurent Bigonville <bi...@debian.org>,
- Loic Minier <l...@dooz.org>,
- Jonny Lamb <jo...@debian.org>
+ Loic Minier <l...@dooz.org>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
libglib2.0-dev (>= 2.30),
@@ -16,11 +13,11 @@ Build-Depends: debhelper (>= 9),
libsofia-sip-ua-glib-dev (>= 1.12.11),
libtelepathy-glib-dev (>= 0.17.7),
libssl-dev,
- xsltproc,
- python
+ python2,
+ xsltproc
Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/pkg-telepathy/telepathy-rakia.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-telepathy/telepathy-rakia.git
+Vcs-Git: https://salsa.debian.org/telepathy-team/telepathy-rakia.git
+Vcs-Browser: https://salsa.debian.org/telepathy-team/telepathy-rakia
Homepage: http://telepathy.freedesktop.org/
Package: telepathy-rakia
@@ -33,13 +30,3 @@ Provides: telepathy-connection-manager, telepathy-sofiasip
Description: SIP connection manager for the Telepathy framework
telepathy-rakia is a SIP connection manager for the Telepathy framework
(http://telepathy.freedesktop.org) based on the SofiaSIP-stack.
-
-Package: telepathy-sofiasip
-Architecture: all
-Section: oldlibs
-Priority: extra
-Depends: telepathy-rakia,
- ${misc:Depends}
-Description: Transitional package for telepathy-rakia
- This is a transitional package to ease upgrades to the telepathy-rakia
- package. It can safely be removed.
diff --git a/debian/rules b/debian/rules
index 99cb3d3..62a60ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,9 @@ override_dh_auto_configure:
--libdir="\$${prefix}/lib" \
--libexecdir="\$${libdir}/telepathy" \
--disable-static \
+ PYTHON=python2 \
$(NULL)
-override_dh_install:
- dh_install --list-missing
-
# The regression tests are too prone to race conditions for the buildds,
# and don't work when autoreconf'd with Automake 1.13.
override_dh_auto_test:
diff --git a/debian/telepathy-rakia.install b/debian/telepathy-rakia.install
deleted file mode 100644
index 0148204..0000000
--- a/debian/telepathy-rakia.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/
-usr/lib/telepathy/
-usr/share/dbus-1/services/
-usr/share/man/man8/
-usr/share/telepathy/managers/
