[Pkg-telepathy-commits] [telepathy-gabble-1] 04/05: New parallel-installable upstream branch
Simon McVittie
smcv at debian.org
Thu Mar 27 20:05:39 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-gabble-1.
commit ad098def1d11751272914dfe7656ab734035488a
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 27 18:33:38 2014 +0000
New parallel-installable upstream branch
* Add autopkgtest support
---
debian/changelog | 7 +++++
debian/control | 30 ++++++++++++----------
debian/rules | 19 ++++++--------
debian/shlibs.local.in | 4 +--
debian/telepathy-gabble-1-tests.install | 2 ++
debian/telepathy-gabble-1-tests.lintian-overrides | 1 +
...lepathy-gabble.docs => telepathy-gabble-1.docs} | 0
debian/telepathy-gabble-1.install | 8 ++++++
debian/telepathy-gabble-tests.install | 1 -
debian/telepathy-gabble-tests.lintian-overrides | 1 -
debian/telepathy-gabble.install | 8 ------
debian/tests/control | 2 ++
debian/tests/installed-tests | 8 ++++++
13 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a9087ae..0eb704a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+telepathy-gabble-1 (0.99.8+20+gc3c3bb5-0tp1.1) UNRELEASED; urgency=low
+
+ * New parallel-installable upstream branch
+ * Add autopkgtest support
+
+ -- Simon McVittie <smcv at debian.org> Wed, 26 Mar 2014 13:59:00 +0000
+
telepathy-gabble (0.18.2-1) unstable; urgency=medium
* New upstream stable release
diff --git a/debian/control b/debian/control
index 54f94d7..02cbc49 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: telepathy-gabble
+Source: telepathy-gabble-1
Section: net
Priority: optional
Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
@@ -13,49 +13,51 @@ Build-Depends: autotools-dev (>= 20100122.1~),
dpkg-dev (>= 1.16.1~),
gnutls-bin,
libdbus-1-dev (>= 1.1.0),
- libdbus-glib-1-dev (>= 0.82),
- libglib2.0-dev (>= 2.32),
+ libdbus-glib-1-dev (>= 0.102),
+ libglib2.0-dev (>= 2.39.90),
libgnutls-dev (>= 2.8.2),
libsasl2-dev,
libsoup2.4-dev,
- libtelepathy-glib-dev (>= 0.19.7),
+ libtelepathy-glib-1-dev (>= 0.99.9),
python,
xsltproc,
libsqlite3-dev,
libnice-dev (>= 0.0.11)
Standards-Version: 3.9.5
-Vcs-Git: git://anonscm.debian.org/pkg-telepathy/telepathy-gabble.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-telepathy/telepathy-gabble.git
+Vcs-Git: git://anonscm.debian.org/pkg-telepathy/telepathy-gabble-1.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-telepathy/telepathy-gabble-1.git
Homepage: http://telepathy.freedesktop.org/wiki/
+XS-Testsuite: autopkgtest
-Package: telepathy-gabble
+Package: telepathy-gabble-1
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: telepathy-mission-control-5 (<< 1:5.5)
-Provides: telepathy-connection-manager
Description: Jabber/XMPP connection manager
Gabble is a Jabber/XMPP connection manager for the Telepathy framework,
currently supporting single user chats, multi user chats and voice/video
calls. Install this package to use Telepathy instant messaging clients
with Jabber/XMPP servers, including Google Talk and Facebook Chat.
-Package: telepathy-gabble-dbg
+Package: telepathy-gabble-1-dbg
Priority: extra
Section: debug
Architecture: any
-Depends: telepathy-gabble (= ${binary:Version}), ${misc:Depends}
+Depends: telepathy-gabble-1 (= ${binary:Version}), ${misc:Depends}
Description: Jabber/XMPP connection manager (debug symbols)
Gabble is a Jabber/XMPP connection manager for the Telepathy framework.
.
This package contains debug symbols necessary to debug crashes in Gabble.
-Package: telepathy-gabble-tests
+Package: telepathy-gabble-1-tests
Priority: extra
Section: debug
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- telepathy-gabble (= ${binary:Version}),
- python-twisted, python-openssl, python-gobject
+ python-gobject,
+ python-openssl,
+ python-twisted,
+ telepathy-gabble-1 (= ${binary:Version}),
+Recommends: gnome-desktop-testing,
Description: Jabber/XMPP connection manager (automated tests)
Gabble is a Jabber/XMPP connection manager for the Telepathy framework.
.
diff --git a/debian/rules b/debian/rules
index d84ebd4..71dc42b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,11 @@ include /usr/share/dpkg/default.mk
%:
dh $@ --with autoreconf --parallel
-# Now that we use debhelper 9, dh_auto_configure defaults to
-# $libexecdir=$libdir, which might be better than this, but doesn't match
-# our historical practice (so it'd break old debugging instructions).
-# Leaving it as it was for now...
override_dh_auto_configure:
dh_auto_configure -- \
--libdir="\$${prefix}/lib" \
--libexecdir="\$${prefix}/lib/telepathy" \
+ --htmldir="/usr/share/doc/telepathy-gabble-1" \
--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt \
--disable-static \
--enable-installed-tests
@@ -26,17 +23,17 @@ override_dh_auto_test:
# private libraries
override_dh_auto_install:
dh_auto_install
- rm -f debian/tmp/usr/lib/telepathy/gabble-0/plugins/*.la
- rm -f debian/tmp/usr/lib/telepathy-gabble-tests/plugins/*.la
- rm -f debian/tmp/usr/lib/telepathy/gabble-0/lib/*.la
- rm -f debian/tmp/usr/lib/telepathy/gabble-0/lib/libwocky.so
- rm -f debian/tmp/usr/lib/telepathy/gabble-0/lib/libgabble-plugins.so
+ rm -f debian/tmp/usr/lib/telepathy/gabble-1/plugins/*.la
+ rm -f debian/tmp/usr/lib/telepathy/gabble-1/*.la
+ rm -f debian/tmp/usr/lib/telepathy/gabble-1/libwocky.so
+ rm -f debian/tmp/usr/lib/telepathy/gabble-1/libgabble-plugins.so
+ rm -f debian/tmp/usr/lib/telepathy-gabble-1-tests/plugins/*.la
override_dh_install:
dh_install --list-missing
override_dh_strip:
- dh_strip --dbg-package=telepathy-gabble-dbg
+ dh_strip --dbg-package=telepathy-gabble-1-dbg
# the libraries are considered private, nothing in Debian should depend on them
override_dh_makeshlibs:
@@ -46,4 +43,4 @@ override_dh_shlibdeps:
sed -e 's!@DEB_VERSION_UPSTREAM@!$(DEB_VERSION_UPSTREAM)!' \
< debian/shlibs.local.in \
> debian/shlibs.local
- dh_shlibdeps -Ltelepathy-gabble
+ dh_shlibdeps -Ltelepathy-gabble-1
diff --git a/debian/shlibs.local.in b/debian/shlibs.local.in
index 2b6da13..262b8c7 100644
--- a/debian/shlibs.local.in
+++ b/debian/shlibs.local.in
@@ -1,2 +1,2 @@
-libwocky-telepathy-gabble @DEB_VERSION_UPSTREAM@ telepathy-gabble (= ${binary:Version})
-libgabble-plugins @DEB_VERSION_UPSTREAM@ telepathy-gabble (= ${binary:Version})
+libwocky-telepathy-gabble @DEB_VERSION_UPSTREAM@ telepathy-gabble-1 (= ${binary:Version})
+libgabble-plugins @DEB_VERSION_UPSTREAM@ telepathy-gabble-1 (= ${binary:Version})
diff --git a/debian/telepathy-gabble-1-tests.install b/debian/telepathy-gabble-1-tests.install
new file mode 100644
index 0000000..82d4725
--- /dev/null
+++ b/debian/telepathy-gabble-1-tests.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/installed-tests/telepathy-gabble-1
+debian/tmp/usr/lib/telepathy-gabble-1-tests
diff --git a/debian/telepathy-gabble-1-tests.lintian-overrides b/debian/telepathy-gabble-1-tests.lintian-overrides
new file mode 100644
index 0000000..2047d72
--- /dev/null
+++ b/debian/telepathy-gabble-1-tests.lintian-overrides
@@ -0,0 +1 @@
+telepathy-gabble-1-tests: binary-or-shlib-defines-rpath * /usr/lib/telepathy/gabble-1
diff --git a/debian/telepathy-gabble.docs b/debian/telepathy-gabble-1.docs
similarity index 100%
rename from debian/telepathy-gabble.docs
rename to debian/telepathy-gabble-1.docs
diff --git a/debian/telepathy-gabble-1.install b/debian/telepathy-gabble-1.install
new file mode 100644
index 0000000..6034322
--- /dev/null
+++ b/debian/telepathy-gabble-1.install
@@ -0,0 +1,8 @@
+debian/tmp/usr/lib/telepathy/telepathy-gabble-1
+debian/tmp/usr/lib/telepathy/gabble-1/libgabble-plugins-*.so
+debian/tmp/usr/lib/telepathy/gabble-1/libwocky-*.so
+debian/tmp/usr/lib/telepathy/gabble-1/plugins/*.so
+debian/tmp/usr/share/man
+debian/tmp/usr/share/dbus-1
+debian/tmp/usr/share/telepathy-1
+debian/tmp/usr/share/doc/telepathy-gabble-1
diff --git a/debian/telepathy-gabble-tests.install b/debian/telepathy-gabble-tests.install
deleted file mode 100644
index a0c8acf..0000000
--- a/debian/telepathy-gabble-tests.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/telepathy-gabble-tests
diff --git a/debian/telepathy-gabble-tests.lintian-overrides b/debian/telepathy-gabble-tests.lintian-overrides
deleted file mode 100644
index 296930b..0000000
--- a/debian/telepathy-gabble-tests.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-telepathy-gabble-tests: binary-or-shlib-defines-rpath * /usr/lib/telepathy/gabble-0/lib
diff --git a/debian/telepathy-gabble.install b/debian/telepathy-gabble.install
deleted file mode 100644
index a299646..0000000
--- a/debian/telepathy-gabble.install
+++ /dev/null
@@ -1,8 +0,0 @@
-debian/tmp/usr/lib/telepathy/telepathy-gabble
-debian/tmp/usr/lib/telepathy/gabble-0/lib/libgabble-plugins-*.so
-debian/tmp/usr/lib/telepathy/gabble-0/lib/libwocky-*.so
-debian/tmp/usr/lib/telepathy/gabble-0/plugins/*.so
-debian/tmp/usr/share/man
-debian/tmp/usr/share/dbus-1
-debian/tmp/usr/share/telepathy
-debian/tmp/usr/share/doc/telepathy-gabble
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..93cfb96
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: installed-tests
+Depends: gnome-desktop-testing, telepathy-gabble-1-tests
diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests
new file mode 100755
index 0000000..4634d72
--- /dev/null
+++ b/debian/tests/installed-tests
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+XDG_RUNTIME_DIR=$ADTTMP
+export XDG_RUNTIME_DIR
+
+gnome-desktop-testing-runner telepathy-gabble-1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-gabble-1.git
More information about the Pkg-telepathy-commits
mailing list