[Pkg-telepathy-commits] [empathy] 08/08: New snapshot from the 'next' (Telepathy 1) branch
Simon McVittie
smcv at debian.org
Thu Mar 27 20:12:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch telepathy1
in repository empathy.
commit 709c0411a7766cc4ac0e02725e090bf090fd7fec
Author: Simon McVittie <smcv at debian.org>
Date: Thu Mar 27 19:13:57 2014 +0000
New snapshot from the 'next' (Telepathy 1) branch
* Update dependencies for Telepathy-1
* Bump debian/compat to 9
* Explicitly set the multiarch ${libdir}, required for MC 6 plugins
(it seems cdbs doesn't do that even under dh compat 9)
---
debian/changelog | 7 ++++++-
debian/compat | 2 +-
debian/control | 24 ++++++++++++------------
debian/empathy.install | 6 +++---
debian/rules | 5 +++--
debian/shlibs.local | 4 ++--
6 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e7f9298..3af58e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-empathy (3.12.0-1) UNRELEASED; urgency=medium
+empathy (3.12.0+64+gc963117-0tp1.1) UNRELEASED; urgency=medium
[ Laurent Bigonville ]
* New upstream release
@@ -17,6 +17,11 @@ empathy (3.12.0-1) UNRELEASED; urgency=medium
* Test whether to enable Linux-specifics via host OS, not build OS
(in case you're cross-compiling for kFreeBSD on a Linux build machine,
or whatever)
+ * New snapshot from the 'next' (Telepathy 1) branch
+ * Update dependencies for Telepathy-1
+ * Bump debian/compat to 9
+ * Explicitly set the multiarch ${libdir}, required for MC 6 plugins
+ (it seems cdbs doesn't do that even under dh compat 9)
-- Laurent Bigonville <bigon at debian.org> Mon, 24 Mar 2014 18:16:07 +0100
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index b6bde6f..19da736 100644
--- a/debian/control
+++ b/debian/control
@@ -10,12 +10,12 @@ Uploaders: Sjoerd Simons <sjoerd at debian.org>,
Jonny Lamb <jonny at debian.org>,
Emilio Pozuelo Monfort <pochu at debian.org>
Build-Depends: cdbs (>= 0.4.90),
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
- libglib2.0-dev (>= 2.37.6),
+ libglib2.0-dev (>= 2.39.90),
libgtk-3-dev (>= 3.9.4),
- libtelepathy-glib-dev (>= 0.23.2),
- libtelepathy-logger-dev (>= 0.8.0),
+ libtelepathy-glib-1-dev (>= 0.99.9),
+ libtelepathy-logger-1-dev (>= 0.99.9),
intltool (>= 0.50.0),
libenchant-dev (>= 1.2.0),
iso-codes,
@@ -42,9 +42,9 @@ Build-Depends: cdbs (>= 0.4.90),
libclutter-gst-2.0-dev,
libcogl-dev (>= 1.14),
libgudev-1.0-dev [linux-any],
- libmission-control-plugins-dev (>= 1:5.14.0),
+ libmission-control-plugins-6-dev,
libpulse-dev,
- libtelepathy-farstream-dev (>= 0.6.0),
+ libtelepathy-farstream-1-dev (>= 0.6.0),
libgoa-1.0-dev (>= 3.8),
libchamplain-gtk-0.12-dev (>= 0.12.1),
libsecret-1-dev
@@ -58,20 +58,20 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
empathy-common (= ${source:Version}),
- telepathy-mission-control-5 (>= 1:5.12.0),
+ telepathy-mission-control-6,
gsettings-desktop-schemas,
gnome-icon-theme (>= 2.30.0),
geoclue-2.0 (>= 2.0),
- telepathy-logger (>= 0.2.13),
+ telepathy-logger-1,
dbus-x11,
gstreamer1.0-pulseaudio
-Recommends: telepathy-gabble,
- telepathy-salut,
- telepathy-haze,
+Recommends: telepathy-gabble-1,
+ telepathy-salut-1,
+ telepathy-haze-1,
gvfs-backends,
sound-theme-freedesktop
Suggests: vino,
- telepathy-idle
+ telepathy-idle-1
Replaces: libempathy-gtk-common
Description: GNOME multi-protocol chat and call client
Instant messaging program supporting text, voice, video, file transfers
diff --git a/debian/empathy.install b/debian/empathy.install
index 10093cc..92e8be0 100644
--- a/debian/empathy.install
+++ b/debian/empathy.install
@@ -1,10 +1,10 @@
usr/bin/
-usr/lib/empathy/*.so
+usr/lib/*/empathy/*.so
usr/lib/empathy/empathy-*
-usr/lib/mission-control-plugins*/mcp-account-manager-goa.so
+usr/lib/*/mission-control-plugins*/mcp-account-manager-goa.so
usr/share/man/man1/
usr/share/applications/
usr/share/dbus-1/services/
-usr/share/telepathy/clients/
+usr/share/telepathy-1/clients/
usr/share/GConf/gsettings/empathy.convert
usr/share/glib-2.0/schemas/
diff --git a/debian/rules b/debian/rules
index ff3ee69..c775bcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,8 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell=yes \
--with-eds \
--disable-schemas-compile \
--enable-map=yes \
- --enable-goa=yes
+ --enable-goa=yes \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
ifeq ($(DEB_HOST_ARCH_OS),linux)
DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=nm --enable-gudev=yes
@@ -32,7 +33,7 @@ else
DEB_CONFIGURE_EXTRA_FLAGS += --with-connectivity=no --enable-gudev=no
endif
-DEB_DH_MAKESHLIBS_ARGS_ALL = -Xusr/lib/mission-control-plugins.0/ -Xusr/lib/empathy/
+DEB_DH_MAKESHLIBS_ARGS_ALL = -Xusr/lib/mission-control-plugins-6-0/ -Xusr/lib/empathy/
DEB_DH_SHLIBDEPS_ARGS_ALL = -Lempathy
include $(CURDIR)/debian/update-patches.mk
diff --git a/debian/shlibs.local b/debian/shlibs.local
index daa033e..19d4c6d 100644
--- a/debian/shlibs.local
+++ b/debian/shlibs.local
@@ -1,2 +1,2 @@
-libempathy-gtk 3.10.3 empathy (= ${binary:Version})
-libempathy 3.10.3 empathy (= ${binary:Version})
+libempathy-gtk 3.12.0.1.20140327 empathy (= ${binary:Version})
+libempathy 3.12.0.1.20140327 empathy (= ${binary:Version})
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git
More information about the Pkg-telepathy-commits
mailing list