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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit e562e032fe6f60795f1cb3e2cbe7b7a207d7b515
Author: Pino Toscano <pino at debian.org>
Date:   Thu Dec 28 22:45:26 2017 +0100

    drop kfind
---
 debian/changelog     |  5 +++++
 debian/control       | 11 +----------
 debian/kfind.install | 13 -------------
 debian/not-installed |  1 -
 debian/rules         |  2 +-
 5 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a26f95d..cbdf093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 kde-baseapps (4:16.08.3-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Remove kfind, as it will be provided by an own kfind source:
+    - drop the kfind binary
+    - pass -DBUILD_kfind=false to cmake
+    - clean not-installed file
 
  -- 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 75fa91f..40e6a9e 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Architecture: all
 Depends: dolphin,
          kde-baseapps-bin (>= ${source:Version}),
          kdepasswd (>= ${source:Version}),
-         kfind (>= ${source:Version}),
+         kfind,
          konqueror,
          konsole,
          kwrite,
@@ -98,15 +98,6 @@ Description: graphical password changing utility
  .
  This package is part of the KDE base applications module.
 
-Package: kfind
-Section: utils
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: file search utility
- KFind can be used to find files and directories on your system.
- .
- This package is part of the KDE base applications module.
-
 Package: libkonq-common
 Section: libs
 Architecture: any
diff --git a/debian/kfind.install b/debian/kfind.install
deleted file mode 100644
index 0271226..0000000
--- a/debian/kfind.install
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/bin/kfind
-usr/share/appdata/kfind.appdata.xml
-usr/share/applications/kde4/kfind.desktop
-usr/share/doc/kde/HTML/en/kfind/common
-usr/share/doc/kde/HTML/en/kfind/index.cache.bz2
-usr/share/doc/kde/HTML/en/kfind/index.docbook
-usr/share/doc/kde/HTML/en/kfind/man-kfind.1.docbook
-usr/share/icons/hicolor/16x16/apps/kfind.png
-usr/share/icons/hicolor/22x22/apps/kfind.png
-usr/share/icons/hicolor/32x32/apps/kfind.png
-usr/share/icons/hicolor/48x48/apps/kfind.png
-usr/share/icons/hicolor/64x64/apps/kfind.png
-usr/share/man/man1/kfind.1
diff --git a/debian/not-installed b/debian/not-installed
index d1cd057..84b3809 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -3,7 +3,6 @@
 
 # Manpages are compressed
 ./usr/share/man/man1/kbookmarkmerger.1
-./usr/share/man/man1/kfind.1
 
 # These are moved by dh_movelibkdeinit
 ./usr/lib/libkdeinit4_keditbookmarks.so
diff --git a/debian/rules b/debian/rules
index d118abf..93957ed 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 -DBUILD_kdialog=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 -DBUILD_kfind=false
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time

-- 
KDE Base Applications module packaging