[SCM] KDE Base Applications module packaging branch, master, updated. debian/16.08.3-1-9-g32d7c40

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 32d7c408ccd1f99bb0a8b085ae8a678fac0fe402
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 24 16:54:54 2017 +0100

    drop kdialog
---
 debian/changelog                | 5 +++++
 debian/control                  | 1 +
 debian/kde-baseapps-bin.install | 1 -
 debian/not-installed            | 3 ---
 debian/rules                    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36f5efd..9ceb804 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,11 @@ kde-baseapps (4:16.08.3-2~) UNRELEASED; urgency=medium
   * Drop unneeded build dependencies:
     - libglib2.0-dev, libqimageblitz-dev, libsoprano-dev, libtidy-dev,
       libxkbfile-dev, libxrender-dev, and libxt-dev
+  * Remove kdialog, as it will be provided by an own kdiaog source:
+    - update install files
+    - pass -DBUILD_kdialog=false to cmake
+    - clean not-installed file
+    - make kde-baseapps-bin depend on kdialog, to avoid breaking all the rdeps.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 31 Oct 2017 17:59:45 +0100
 
diff --git a/debian/control b/debian/control
index 9056412..e5d05af 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,7 @@ Description: base applications from the official KDE release (metapackage)
 Package: kde-baseapps-bin
 Architecture: any
 Depends: kde-baseapps-data (= ${source:Version}),
+         kdialog,
          ${misc:Depends},
          ${shlibs:Depends},
 Breaks: kcontrol, kdebase-bin (<< 4:4.7.2), kdesktop,
diff --git a/debian/kde-baseapps-bin.install b/debian/kde-baseapps-bin.install
index 4e43a8c..acc3737 100644
--- a/debian/kde-baseapps-bin.install
+++ b/debian/kde-baseapps-bin.install
@@ -1,5 +1,4 @@
 usr/bin/kbookmarkmerger
-usr/bin/kdialog
 usr/bin/keditbookmarks
 usr/lib/libkbookmarkmodel_private.so.4
 usr/lib/libkbookmarkmodel_private.so.4.*
diff --git a/debian/not-installed b/debian/not-installed
index 0bb5350..d1cd057 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,9 +1,6 @@
 # Symlinks of private libraries
 ./usr/lib/libkbookmarkmodel_private.so
 
-# Only for deveploment and we are not shipping any kdebase-dev
-./usr/share/dbus-1/interfaces/org.kde.kdialog.ProgressDialog.xml
-
 # Manpages are compressed
 ./usr/share/man/man1/kbookmarkmerger.1
 ./usr/share/man/man1/kfind.1
diff --git a/debian/rules b/debian/rules
index f2d152b..d118abf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DKDE4_BUILD_TESTS=false -DBUILD_plasma=false -DBUILD_dolphin=false -DBUILD_konqueror=false -DBUILD_konq-plugins=false -DBUILD_nsplugins=false
+	$(overridden_command) -- -DKDE4_BUILD_TESTS=false -DBUILD_plasma=false -DBUILD_dolphin=false -DBUILD_konqueror=false -DBUILD_konq-plugins=false -DBUILD_nsplugins=false -DBUILD_kdialog=false
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time

-- 
KDE Base Applications module packaging