[Pkg-telepathy-commits] [empathy] 08/12: Merge remote-tracking branch 'origin/debian' into telepathy1
Simon McVittie
smcv at debian.org
Wed May 14 12:06:54 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 6f0ce2a3b407900fc74aeffb2200fda926479799
Merge: d8debcf c10fb91
Author: Simon McVittie <smcv at debian.org>
Date: Wed May 14 11:47:08 2014 +0100
Merge remote-tracking branch 'origin/debian' into telepathy1
Conflicts:
ChangeLog
configure
configure.ac
data/empathy.desktop
data/empathy.desktop.in
debian/changelog
help/cs/prob-conn-neterror.page
help/cs/salut-protocol.page
debian/changelog | 29 +++++++++++++++++++++--------
debian/control | 2 +-
debian/empathy.install | 1 +
3 files changed, 23 insertions(+), 9 deletions(-)
diff --cc debian/changelog
index beb1397,c5f2567..a888845
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,12 +1,23 @@@
- empathy (3.12.0+66+g529cd04-0tp1.1) telepathy1; urgency=low
++empathy (3.12.2+76+g800728d-0tp1.1) telepathy1; urgency=low
++
++ [ Simon McVittie ]
++ * 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)
++
++ -- Simon McVittie <smcv at debian.org> Thu, 03 Apr 2014 19:40:22 +0100
++
+ empathy (3.12.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * debian/control: Update Homepage URL
+ * debian/empathy.install: Also install appdata files
+
+ -- Laurent Bigonville <bigon at debian.org> Sat, 19 Apr 2014 16:19:48 +0200
+
+ empathy (3.12.0-1) unstable; urgency=medium
[ Laurent Bigonville ]
* New upstream release
diff --cc debian/empathy.install
index 92e8be0,57bc19d..8377855
--- a/debian/empathy.install
+++ b/debian/empathy.install
@@@ -1,10 -1,11 +1,11 @@@
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/appdata/
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/
--
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