After discussing this with ricotz a bit more, it looks like we can
build this with python3 instead. I intend to NMU this as soon as vala
0.38 is in unstable (as soon as tomorrow). python3-zeitgeist will need
to go through the NEW queue.
Updated patches attached.
Thanks,
Jeremy Bicha
From 8ebac33bdb02ea78ee671944d1e832417608104a Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 5 Feb 2018 15:56:02 -0500
Subject: [PATCH 1/3] Switch python-zeitgeist to python3-zeitgeist
Closes: #781909
---
debian/changelog | 7 +++++++
debian/control | 18 ++++++++----------
...hon-zeitgeist.install => python3-zeitgeist.install} | 0
debian/rules | 4 +++-
4 files changed, 18 insertions(+), 11 deletions(-)
rename debian/{python-zeitgeist.install => python3-zeitgeist.install} (100%)
diff --git a/debian/changelog b/debian/changelog
index de65579..f815f88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zeitgeist (1.0-0.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Switch python-zeitgeist to python3-zeitgeist (Closes: #781909)
+
+ -- Jeremy Bicha <jbi...@debian.org> Mon, 05 Feb 2018 15:54:49 -0500
+
zeitgeist (1.0-0.1) unstable; urgency=medium
[ Jeremy Bicha ]
diff --git a/debian/control b/debian/control
index 8806363..f8d21bb 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,9 @@ Build-Depends: debhelper (>= 10),
libsqlite3-dev (>= 3.7.11),
libtelepathy-glib-dev (>= 0.18.0),
libxapian-dev,
- python-all (>= 2.6.6-3~),
+ python3-all (>= 2.6.6-3~),
python-gi,
- python-rdflib,
+ python3-rdflib,
raptor2-utils,
valac (>= 0.22),
valadoc
@@ -25,13 +25,12 @@ Homepage: http://zeitgeist-project.com/
Standards-Version: 4.1.1
Vcs-Git: https://anonscm.debian.org/git/collab-maint/zeitgeist.git
Vcs-Browser: https://anonscm.debian.org/git/collab-maint/zeitgeist.git
-X-Python-Version: >= 2.6
Package: zeitgeist
Architecture: all
Depends: ${misc:Depends},
zeitgeist-core,
- python-zeitgeist,
+ python3-zeitgeist,
zeitgeist-datahub
Description: event logging framework
Zeitgeist is a service which logs the user's activities and events (files
@@ -63,15 +62,14 @@ Description: event logging framework - engine
codenamed "Bluebird"). It also includes the FTS (Full Text Search)
extension.
-Package: python-zeitgeist
+Package: python3-zeitgeist
Architecture: all
Section: python
Depends: ${misc:Depends},
- ${python:Depends},
- python-xdg,
- python-dbus,
- python-gobject-2,
- python-gi
+ ${python3:Depends},
+ python3-xdg,
+ python3-dbus,
+ python3-gi
Replaces: zeitgeist-core (<< 0.8.99~alpha1)
Breaks: zeitgeist-core (<< 0.8.99~alpha1)
Description: event logging framework - Python bindings
diff --git a/debian/python-zeitgeist.install b/debian/python3-zeitgeist.install
similarity index 100%
rename from debian/python-zeitgeist.install
rename to debian/python3-zeitgeist.install
diff --git a/debian/rules b/debian/rules
index 7e8eb77..8ea99ab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
+export PYTHON=python3
+
%:
- dh $@ --with python2,gir
+ dh $@ --with python3,gir
override_dh_auto_configure:
dh_auto_configure -- --libexecdir=/usr/lib/zeitgeist \
--
2.15.1
From 323e8d910f3a8d69ed99bef9b4d81a295e4cdb98 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Sun, 4 Feb 2018 17:48:17 -0500
Subject: [PATCH 2/3] Use Launchpad site as homepage (LP: #1744536)
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index f8d21bb..4b71432 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 10),
raptor2-utils,
valac (>= 0.22),
valadoc
-Homepage: http://zeitgeist-project.com/
+Homepage: https://launchpad.net/zeitgeist-project
Standards-Version: 4.1.1
Vcs-Git: https://anonscm.debian.org/git/collab-maint/zeitgeist.git
Vcs-Browser: https://anonscm.debian.org/git/collab-maint/zeitgeist.git
--
2.15.1
From a31e7cb36e768a75b916f7a2a1cfa84edfae15a2 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 5 Feb 2018 16:06:12 -0500
Subject: [PATCH 3/3] releasing package zeitgeist version 1.0-0.2
---
debian/changelog | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f815f88..2d9affa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-zeitgeist (1.0-0.2) UNRELEASED; urgency=medium
+zeitgeist (1.0-0.2) unstable; urgency=medium
* Non-maintainer upload.
* Switch python-zeitgeist to python3-zeitgeist (Closes: #781909)
+ * Use Launchpad site as homepage (LP: #1744536)
- -- Jeremy Bicha <jbi...@debian.org> Mon, 05 Feb 2018 15:54:49 -0500
+ -- Jeremy Bicha <jbi...@debian.org> Mon, 05 Feb 2018 16:05:52 -0500
zeitgeist (1.0-0.1) unstable; urgency=medium
--
2.15.1
