[SCM] meta-kde-telepathy packaging branch, master, updated. 4a9c8fbd31533098ea47bb8e6b5356682a7f5e26

[George Kiagiadakis]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/meta-kde-telepathy.git;a=commitdiff;h=4a9c8fb

The following commit has been merged in the master branch:
commit 4a9c8fbd31533098ea47bb8e6b5356682a7f5e26
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Sun Jun 17 21:48:07 2012 +0300

    Update to 0.4
---
 debian/changelog |    4 +-
 debian/compat    |    2 +-
 debian/control   |   74 +++++++++++++++++++++++++++++++++++++----------------
 debian/rules     |    2 +-
 4 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37f4f21..da2c0c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-meta-telepathy-kde (0.2.0-1) UNRELEASED; urgency=low
+meta-kde-telepathy (0.4.0-0r1) UNRELEASED; urgency=low
 
   * Initial release.
 
- -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Thu, 01 Dec 2011 00:58:11 +0200
+ -- George Kiagiadakis <kiagiadakis.george at gmail.com>  Sun, 17 Jun 2012 20:32:07 +0300
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 77df621..5adf17f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,27 +1,55 @@
-Source: meta-telepathy-kde
-Section: kde
+Source: meta-kde-telepathy
+Section: metapackages
 Priority: optional
-Maintainer: George Kiagiadakis <kiagiadakis.george at gmail.com>
-Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.2
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: George Kiagiadakis <kiagiadakis.george at gmail.com>
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/meta-kde-telepathy.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kde-telepathy/meta-kde-telepathy.git
 
-Package: telepathy-kde
+Package: kde-telepathy-minimal
 Architecture: all
-Depends: telepathy-kde-contact-list (>= ${kdetp:Version}),
- telepathy-kde-auth-handler (>= ${kdetp:Version}),
- telepathy-kde-integration-module (>= ${kdetp:Version}),
- telepathy-kde-approver (>= ${kdetp:Version}),
- telepathy-kde-text-ui (>= ${kdetp:Version}),
- kde-config-telepathy-accounts (>= ${kdetp:Version}),
- plasma-widget-telepathy-presence (>= ${kdetp:Version}),
- telepathy-kde-filetransfer-handler (>= ${kdetp:Version}),
- telepathy-kde-send-file (>= ${kdetp:Version}),
- plasma-widget-telepathy-contact (>= ${kdetp:Version}),
- telepathy-mission-control-5,
+Depends: kde-config-telepathy-accounts (>= ${ktp:Version}),
+ kde-telepathy-approver (>= ${ktp:Version}),
+ kde-telepathy-auth-handler (>= ${ktp:Version}),
+ kde-telepathy-contact-list (>= ${ktp:Version}),
+ kde-telepathy-integration-module (>= ${ktp:Version}),
+ plasma-widget-telepathy-presence (>= ${ktp:Version}),
+ kde-telepathy-text-ui (>= ${ktp:Version}),
+ telepathy-mission-control-5 (>= 1:5.12),
  telepathy-connection-manager,
  ${misc:Depends}
-Recommends: telepathy-gabble, telepathy-haze
-Suggests: telepathy-sunshine, telepathy-idle
+Recommends: telepathy-gabble, telepathy-salut, telepathy-haze
+Suggests: telepathy-rakia, telepathy-idle
+Description: metapackage for installing the basic KDE Telepathy components
+ KDE Telepathy aims to integrate real-time communication and collaboration
+ features into the KDE Plasma Workspaces. It provides means to connect
+ to several instant messaging networks, chat with your friends and
+ collaborate with them.
+ .
+ KDE Telepathy consists of several independent components that need to be
+ used together to provide all the available features. This package is
+ a metapackage that installs the most basic components, for the most simple
+ use case. For installing all the components, use the kde-telepathy
+ metapackage.
+ .
+ Apart from the dependencies that this metapackage pulls, you will also
+ need to install at least one of the telepathy-gabble, telepathy-salut,
+ telepathy-haze packages to be able to connect to your IM networks.
+ gabble provides xmpp (jabber, google talk/plus, facebook), salut provides
+ link-local xmpp (using avahi) and haze provides most other common protocols.
+
+Package: kde-telepathy
+Architecture: all
+Depends: kde-telepathy-minimal (= ${binary:Version}),
+ kde-telepathy-call-ui (>= ${ktp:Version}),
+ plasma-runner-telepathy-contact (>= ${ktp:Version}),
+ kde-telepathy-filetransfer-handler (>= ${ktp:Version}),
+ kde-telepathy-send-file (>= ${ktp:Version}),
+ plasma-widget-telepathy-chat (>= ${ktp:Version}),
+# plasma-widget-telepathy-contact (>= ${ktp:Version}),
+ ${misc:Depends}
 Description: metapackage for installing all the KDE Telepathy components
  KDE Telepathy aims to integrate real-time communication and collaboration
  features into the KDE Plasma Workspaces. It provides means to connect
@@ -33,7 +61,7 @@ Description: metapackage for installing all the KDE Telepathy components
  a metapackage that installs all those components.
  .
  Apart from the dependencies that this metapackage pulls, you will also
- need to install at least one of the telepathy-gabble, telepathy-haze
- packages to be able to connect to your IM networks. gabble provides
- xmpp (jabber, google talk/plus, facebook) and haze provides most other
- common protocols.
+ need to install at least one of the telepathy-gabble, telepathy-salut,
+ telepathy-haze packages to be able to connect to your IM networks.
+ gabble provides xmpp (jabber, google talk/plus, facebook), salut provides
+ link-local xmpp (using avahi) and haze provides most other common protocols.
diff --git a/debian/rules b/debian/rules
index f09b602..5b75073 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 SOURCE_VERSION=$(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //' | cut -d'-' -f1)
 
 override_dh_gencontrol:
-	dh_gencontrol -- -Vkdetp:Version='$(SOURCE_VERSION)'
+	dh_gencontrol -- -Vktp:Version='$(SOURCE_VERSION)'
 
 %:
 	dh $@

-- 
meta-kde-telepathy packaging