[Pkg-telepathy-commits] [empathy] 10/11: Run wrap-and-sort
Laurent Bigonville
bigon at moszumanska.debian.org
Thu Aug 31 15:28:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
bigon pushed a commit to branch debian
in repository empathy.
commit 0dc31ecf75b36cf2d877b5d8edf7c418858d4337
Author: Laurent Bigonville <bigon at bigon.be>
Date: Thu Aug 31 17:25:50 2017 +0200
Run wrap-and-sort
---
debian/control | 80 ++++++++++++++++++++++---------------------
debian/empathy-common.install | 4 +--
debian/empathy.install | 8 ++---
3 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/debian/control b/debian/control
index 9bd2c49..d9c2ba9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,44 +7,44 @@ Uploaders: Sjoerd Simons <sjoerd at debian.org>,
Riccardo Setti <giskard at debian.org>,
Laurent Bigonville <bigon at debian.org>,
Emilio Pozuelo Monfort <pochu at debian.org>
-Build-Depends: debhelper (>= 10),
- libglib2.0-dev (>= 2.48.0),
- libgtk-3-dev (>= 3.9.4),
- libtelepathy-glib-dev (>= 0.23.2),
- libtelepathy-logger-dev (>= 0.8.0),
+Build-Depends: at-spi2-core <!nocheck>,
+ dbus <!nocheck>,
+ debhelper (>= 10),
+ geoclue-2.0 (>= 2.1.0),
+ gsettings-desktop-schemas-dev,
intltool (>= 0.50.0),
- libenchant-dev (>= 1.2.0),
iso-codes,
- xsltproc,
- yelp-tools,
libcanberra-gtk3-dev,
- libnotify-dev (>= 0.7.0),
- libsoup2.4-dev (>= 2.42.0),
- libx11-dev,
+ libchamplain-gtk-0.12-dev (>= 0.12.1),
+ libcheese-gtk-dev (>= 3.7),
+ libclutter-gst-3.0-dev,
+ libclutter-gtk-1.0-dev (>= 1.4),
+ libcogl-dev (>= 1.14),
libdbus-glib-1-dev,
- libgstreamer-plugins-base1.0-dev,
- geoclue-2.0 (>= 2.1.0),
- libgcr-3-dev (>= 2.91.4),
+ libenchant-dev (>= 1.2.0),
libfolks-dev (>= 0.9.5),
libfolks-telepathy-dev (>= 0.9.5),
- libwebkit2gtk-4.0-dev (>= 2.12.0),
- gsettings-desktop-schemas-dev,
+ libgcr-3-dev (>= 2.91.4),
libgeocode-glib-dev (>= 0.99.1),
- libcheese-gtk-dev (>= 3.7),
- libclutter-gtk-1.0-dev (>= 1.4),
- libclutter-gst-3.0-dev,
- libcogl-dev (>= 1.14),
+ libglib2.0-dev (>= 2.48.0),
+ libgoa-1.0-dev (>= 3.8),
+ libgstreamer-plugins-base1.0-dev,
+ libgtk-3-dev (>= 3.9.4),
libgudev-1.0-dev [linux-any],
libmission-control-plugins-dev (>= 1:5.14.0),
+ libnotify-dev (>= 0.7.0),
libpulse-dev,
- libtelepathy-farstream-dev (>= 0.6.0),
- libgoa-1.0-dev (>= 3.8),
- libchamplain-gtk-0.12-dev (>= 0.12.1),
libsecret-1-dev,
- at-spi2-core <!nocheck>,
- dbus <!nocheck>,
+ libsoup2.4-dev (>= 2.42.0),
+ libtelepathy-farstream-dev (>= 0.6.0),
+ libtelepathy-glib-dev (>= 0.23.2),
+ libtelepathy-logger-dev (>= 0.8.0),
+ libwebkit2gtk-4.0-dev (>= 2.12.0),
+ libx11-dev,
xauth <!nocheck>,
- xvfb <!nocheck>
+ xsltproc,
+ xvfb <!nocheck>,
+ yelp-tools
Standards-Version: 4.1.0
Vcs-Git: https://anonscm.debian.org/git/pkg-telepathy/empathy.git
Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-telepathy/empathy.git
@@ -52,23 +52,22 @@ Homepage: https://wiki.gnome.org/Apps/Empathy
Package: empathy
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
+Depends: default-dbus-session-bus | dbus-session-bus,
empathy-common (= ${source:Version}),
- telepathy-mission-control-5 (>= 1:5.12.0),
- gsettings-desktop-schemas,
geoclue-2.0 (>= 2.0),
+ gsettings-desktop-schemas,
+ gstreamer1.0-pulseaudio,
telepathy-logger (>= 0.2.13),
- default-dbus-session-bus | dbus-session-bus,
- gstreamer1.0-pulseaudio
-Recommends: telepathy-gabble,
- telepathy-salut,
- telepathy-haze,
+ telepathy-mission-control-5 (>= 1:5.12.0),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: gnome-contacts,
gvfs-backends,
sound-theme-freedesktop,
- gnome-contacts
-Suggests: vino,
- telepathy-idle
+ telepathy-gabble,
+ telepathy-haze,
+ telepathy-salut
+Suggests: telepathy-idle, vino
Replaces: libempathy-gtk-common
Description: GNOME multi-protocol chat and call client
Instant messaging program supporting text, voice, video, file transfers
@@ -82,7 +81,10 @@ Package: empathy-common
Architecture: all
Depends: ${misc:Depends}
Recommends: yelp
-Replaces: empathy (<< 2.27.92), empathy-doc, libempathy-common, libempathy-gtk-common
+Replaces: empathy (<< 2.27.92),
+ empathy-doc,
+ libempathy-common,
+ libempathy-gtk-common
Conflicts: empathy-doc, libempathy-common, libempathy-gtk-common
Provides: empathy-doc, libempathy-common, libempathy-gtk-common
Description: GNOME multi-protocol chat and call client (common files)
diff --git a/debian/empathy-common.install b/debian/empathy-common.install
index 14ed269..6d43796 100644
--- a/debian/empathy-common.install
+++ b/debian/empathy-common.install
@@ -1,5 +1,5 @@
usr/share/adium/message-styles/
-usr/share/icons/
-usr/share/locale/
usr/share/empathy/
usr/share/help/
+usr/share/icons/
+usr/share/locale/
diff --git a/debian/empathy.install b/debian/empathy.install
index 027c309..2b13b04 100644
--- a/debian/empathy.install
+++ b/debian/empathy.install
@@ -2,10 +2,10 @@ usr/bin/
usr/lib/empathy/*.so
usr/lib/empathy/empathy-*
usr/lib/mission-control-plugins*/mcp-account-manager-goa.so
-usr/share/man/man1/
-usr/share/metainfo/
+usr/share/GConf/gsettings/empathy.convert
usr/share/applications/
usr/share/dbus-1/services/
-usr/share/telepathy/clients/
-usr/share/GConf/gsettings/empathy.convert
usr/share/glib-2.0/schemas/
+usr/share/man/man1/
+usr/share/metainfo/
+usr/share/telepathy/clients/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/empathy.git
More information about the Pkg-telepathy-commits
mailing list