[SCM] KDE Base Applications module packaging branch, master, updated. debian/4%16.08.3-2-4-g2ae8ddf

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kde-baseapps.git;a=commitdiff;h=2ae8ddf

The following commit has been merged in the master branch:
commit 2ae8ddf42bcd44acc126e2d9e838114bca6e97f4
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 31 01:38:17 2017 +0100

    drop kde-baseapps-data
---
 debian/changelog                 |  4 ++++
 debian/control                   | 17 ++---------------
 debian/kde-baseapps-data.install |  7 -------
 debian/not-installed             |  8 ++++++++
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e12da2d..78afb63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,10 @@ kde-baseapps (4:16.08.3-3) UNRELEASED; urgency=medium
     - update kde-baseapps-bin lintian overrides
     - make kde-baseapps-bin depend on keditbookmarks, to avoid breaking all
       the rdeps
+  * Drop the kde-baseapps-data binary, as it is not useful anymore:
+    - stop installing the kdm images
+    - remove the kde-baseapps-data dependency in kde-baseapps-bin, and
+      kdepasswd
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 28 Dec 2017 22:41:57 +0100
 
diff --git a/debian/control b/debian/control
index a0bc028..6381243 100644
--- a/debian/control
+++ b/debian/control
@@ -46,8 +46,7 @@ Description: base applications from the official KDE release (metapackage)
 
 Package: kde-baseapps-bin
 Architecture: any
-Depends: kde-baseapps-data (= ${source:Version}),
-         kdialog,
+Depends: kdialog,
          keditbookmarks,
          ${misc:Depends},
 Breaks: kcontrol, kdebase-bin (<< 4:4.7.2), kdesktop,
@@ -60,17 +59,6 @@ Description: core binaries for the KDE base applications
  .
  This package is part of the KDE base applications module.
 
-Package: kde-baseapps-data
-Architecture: all
-Depends: ${misc:Depends}
-Breaks: kdebase-data (<< 4:4.7.2)
-Replaces: kdebase-data (<< 4:4.7.2)
-Description: shared data files for the KDE base applications
- This package contains the architecture-independent shared data files needed
- for a basic KDE 4 desktop installation.
- .
- This package is part of the KDE 4 base applications module.
-
 Package: kdebase-apps
 Section: oldlibs
 Architecture: all
@@ -89,8 +77,7 @@ Description: Transitional package for new kde-baseapps
 Package: kdepasswd
 Section: utils
 Architecture: any
-Depends: kde-baseapps-data (= ${source:Version}),
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends},
 Description: graphical password changing utility
  kdepasswd allows users to change their password, user icon, and other
diff --git a/debian/kde-baseapps-data.install b/debian/kde-baseapps-data.install
deleted file mode 100644
index efb2654..0000000
--- a/debian/kde-baseapps-data.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/share/kde4/apps/kdm/pics/users/Blackbox.png
-usr/share/kde4/apps/kdm/pics/users/Green.png
-usr/share/kde4/apps/kdm/pics/users/Happy.png
-usr/share/kde4/apps/kdm/pics/users/Listening.png
-usr/share/kde4/apps/kdm/pics/users/Notme.png
-usr/share/kde4/apps/kdm/pics/users/TV.png
-usr/share/kde4/apps/kdm/pics/users/bomb.png
diff --git a/debian/not-installed b/debian/not-installed
index e69de29..7834350 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -0,0 +1,8 @@
+# not useful anymore
+usr/share/kde4/apps/kdm/pics/users/Blackbox.png
+usr/share/kde4/apps/kdm/pics/users/Green.png
+usr/share/kde4/apps/kdm/pics/users/Happy.png
+usr/share/kde4/apps/kdm/pics/users/Listening.png
+usr/share/kde4/apps/kdm/pics/users/Notme.png
+usr/share/kde4/apps/kdm/pics/users/TV.png
+usr/share/kde4/apps/kdm/pics/users/bomb.png

-- 
KDE Base Applications module packaging