[SCM] KDE metapackages branch, master, updated. debian/5%95-4-g98643ad

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/meta-kde.git;a=commitdiff;h=98643ad

The following commit has been merged in the master branch:
commit 98643ad26df57eb83f94f1b7e32b11c82dda433d
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jan 2 22:07:25 2018 +0100

    take over kde-baseapps metapackage
---
 debian/changelog |  3 +++
 debian/control   | 21 +++++++++++++++++++++
 debian/rules     |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5c0cf7b..a62d5e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ meta-kde (5:96) UNRELEASED; urgency=medium
   * Limit the architectures for the akregator, and kmail dependencies also in
     kde-standard.
   * Do not recommend kdepim-doc in kdepim, as it is a transitional package.
+  * Move the kde-baseapps metapackage to this source; hardcode the version of
+    kde-baseapps-bin for now, hoping it will not be needed anymore soon;
+    depend also on kdialog, and keditbookmarks.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Dec 2017 12:04:42 +0100
 
diff --git a/debian/control b/debian/control
index 482df21..a495f22 100644
--- a/debian/control
+++ b/debian/control
@@ -135,6 +135,27 @@ Description: system administration tools from the official KDE release
  This metapackage includes a collection of system administration tools
  provided with the official release of KDE.
 
+Package: kde-baseapps
+Architecture: any
+Depends: dolphin (>= ${kde:Version}),
+         kde-baseapps-bin (>= 4:16.08.3~),
+         kdialog (>= ${kde:Version}),
+         keditbookmarks (>= ${kde:Version}),
+         kfind (>= ${kde:Version}),
+         konqueror (>= ${kde:Version}),
+         konsole (>= ${kde:Version}),
+         kwrite (>= ${kde:Version}),
+         ${misc:Depends},
+Description: base applications from the official KDE release (metapackage)
+ KDE is produced by an international technology team that creates free and open
+ source software for desktop and portable computing. Among KDE's products are a
+ modern desktop system for Linux and UNIX platforms, comprehensive office
+ productivity and groupware suites and hundreds of software titles in many
+ categories including Internet and web applications, multimedia, entertainment,
+ educational, graphics and software development.
+ .
+ This package provides core applications for the desktop.
+
 Package: kdeedu
 Architecture: any
 Depends: artikulate (>= ${kde:Version}),
diff --git a/debian/rules b/debian/rules
index 1ca01b1..54a94b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ DEV_PREV_VERSION := 4:4.11.3
 
 KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdemultimedia kdenetwork kdesdk kdetoys kdeutils
 
-KDE_VERSION_METAPKGS_ADOPTED := kdepim kdewebdev
+KDE_VERSION_METAPKGS_ADOPTED := kde-baseapps kdepim kdewebdev
 MINIMUM_KDE_VERSION_ADOPTED := 4:16.04.3
 
 BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?/./')

-- 
KDE metapackages