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

Sun Dec 31 00:40:21 UTC 2017

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

The following commit has been merged in the master branch:
commit 63ee9173b6579850a390918bc3875fb44b40ee98
Author: Pino Toscano <pino at debian.org>
Date:   Sun Dec 31 01:27:20 2017 +0100

    drop keditbookmarks
---
 debian/changelog                          |   9 ++
 debian/control                            |   2 +-
 debian/kde-baseapps-bin.install           |   6 -
 debian/kde-baseapps-bin.lintian-overrides |   8 +-
 debian/kde-baseapps-bin.manpages          |   1 -
 debian/kde-baseapps-data.install          |   3 -
 debian/man/keditbookmarks.1               | 191 ------------------------------
 debian/not-installed                      |   8 --
 debian/rules                              |   2 +-
 9 files changed, 15 insertions(+), 215 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbdf093..e12da2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,15 @@ kde-baseapps (4:16.08.3-3) UNRELEASED; urgency=medium
     - drop the kfind binary
     - pass -DBUILD_kfind=false to cmake
     - clean not-installed file
+  * Remove keditbookmarks, as it will be provided by an own keditbookmarks
+    source:
+    - update install files
+    - pass -DBUILD_keditbookmarks=false to cmake
+    - drop the local keditbookmarks man page
+    - clean not-installed file
+    - update kde-baseapps-bin lintian overrides
+    - make kde-baseapps-bin depend on keditbookmarks, to avoid breaking all
+      the rdeps
 
  -- 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 40e6a9e..a0bc028 100644
--- a/debian/control
+++ b/debian/control
@@ -48,8 +48,8 @@ Package: kde-baseapps-bin
 Architecture: any
 Depends: kde-baseapps-data (= ${source:Version}),
          kdialog,
+         keditbookmarks,
          ${misc:Depends},
-         ${shlibs:Depends},
 Breaks: kcontrol, kdebase-bin (<< 4:4.7.2), kdesktop,
         konqueror (<< 4:16.08.3-2~)
 Replaces: kdebase-bin (<< 4:4.7.2),
diff --git a/debian/kde-baseapps-bin.install b/debian/kde-baseapps-bin.install
deleted file mode 100644
index acc3737..0000000
--- a/debian/kde-baseapps-bin.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/kbookmarkmerger
-usr/bin/keditbookmarks
-usr/lib/libkbookmarkmodel_private.so.4
-usr/lib/libkbookmarkmodel_private.so.4.*
-usr/lib/libkdeinit4_keditbookmarks.so
-usr/share/applications/kde4/keditbookmarks.desktop
diff --git a/debian/kde-baseapps-bin.lintian-overrides b/debian/kde-baseapps-bin.lintian-overrides
index 1a0a921..5b6b69e 100644
--- a/debian/kde-baseapps-bin.lintian-overrides
+++ b/debian/kde-baseapps-bin.lintian-overrides
@@ -1,6 +1,6 @@
-# private library
-kde-baseapps-bin: package-name-doesnt-match-sonames libkbookmarkmodel-private4
-# private library
-kde-baseapps-bin: no-symbols-control-file
 kde-baseapps-bin: breaks-without-version kcontrol
 kde-baseapps-bin: breaks-without-version kdesktop
+# empty package left for transitions
+kde-baseapps-bin: empty-binary-package
+# empty package left for transitions
+kde-baseapps-bin: package-contains-no-arch-dependent-files
diff --git a/debian/kde-baseapps-bin.manpages b/debian/kde-baseapps-bin.manpages
deleted file mode 100644
index 8040d16..0000000
--- a/debian/kde-baseapps-bin.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/keditbookmarks.1
diff --git a/debian/kde-baseapps-data.install b/debian/kde-baseapps-data.install
index 8467bb6..efb2654 100644
--- a/debian/kde-baseapps-data.install
+++ b/debian/kde-baseapps-data.install
@@ -5,6 +5,3 @@ 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
-usr/share/kde4/apps/keditbookmarks/keditbookmarks-genui.rc
-usr/share/kde4/apps/keditbookmarks/keditbookmarksui.rc
-usr/share/kde4/config.kcfg/keditbookmarks.kcfg
diff --git a/debian/man/keditbookmarks.1 b/debian/man/keditbookmarks.1
deleted file mode 100644
index bd192b6..0000000
--- a/debian/man/keditbookmarks.1
+++ /dev/null
@@ -1,191 +0,0 @@
-.\" This file was generated by kdemangen.pl
-.TH KEDITBOOKMARKS 1 "Aug 2008" "K Desktop Environment" "Bookmark Organizer and Editor"
-.SH NAME
-keditbookmarks
-\- Bookmark Organizer and Editor
-.SH SYNOPSIS
-keditbookmarks [Qt\-options] [KDE\-options] [options] [file] 
-.SH DESCRIPTION
-Bookmark Organizer and Editor
-.SH OPTIONS
-.SS
-.SS Arguments:
-.TP
-.B file
-File to edit
-.SS Options:
-.TP
-.B  \-\-importmoz  <filename>
-Import bookmarks from a file in Mozilla format
-.TP
-.B  \-\-importns  <filename>
-Import bookmarks from a file in Netscape (4.x and earlier) format
-.TP
-.B  \-\-importie  <filename>
-Import bookmarks from a file in Internet Explorer's Favorites format
-.TP
-.B  \-\-importopera  <filename>
-Import bookmarks from a file in Opera format
-.TP
-.B  \-\-exportmoz  <filename>
-Export bookmarks to a file in Mozilla format
-.TP
-.B  \-\-exportns  <filename>
-Export bookmarks to a file in Netscape (4.x and earlier) format
-.TP
-.B  \-\-exporthtml  <filename>
-Export bookmarks to a file in a printable HTML format
-.TP
-.B  \-\-exportie  <filename>
-Export bookmarks to a file in Internet Explorer's Favorites format
-.TP
-.B  \-\-exportopera  <filename>
-Export bookmarks to a file in Opera format
-.TP
-.B  \-\-address  <address>
-Open at the given position in the bookmarks file
-.TP
-.B  \-\-customcaption  <caption>
-Set the user-readable caption, for example "Konsole"
-.TP
-.B  \-\-nobrowser  
-Hide all browser related functions
-.TP
-.B  \-\-dbusObjectName  <name>
-A unique name that represents this bookmark collection, usually the kinstance name.
-This should be "konqueror" for the Konqueror bookmarks, "kfile" for KFileDialog bookmarks, etc.
-The final DBus object path is /KBookmarkManager/dbusObjectName
-.SS 
-.SS Generic options:
-.TP
-.B  \-\-help  
-Show help about options
-.TP
-.B  \-\-help\-qt  
-Show Qt specific options
-.TP
-.B  \-\-help\-kde  
-Show KDE specific options
-.TP
-.B  \-\-help\-all  
-Show all options
-.TP
-.B  \-\-author  
-Show author information
-.TP
-.B \-v,  \-\-version  
-Show version information
-.TP
-.B  \-\-license  
-Show license information
-.TP
-.B  \-\-  
-End of options
-.SS 
-.SS KDE options:
-.TP
-.B  \-\-caption  <caption>
-Use 'caption' as name in the titlebar
-.TP
-.B  \-\-icon  <icon>
-Use 'icon' as the application icon
-.TP
-.B  \-\-config  <filename>
-Use alternative configuration file
-.TP
-.B  \-\-nocrashhandler  
-Disable crash handler, to get core dumps
-.TP
-.B  \-\-waitforwm  
-Waits for a WM_NET compatible windowmanager
-.TP
-.B  \-\-style  <style>
-sets the application GUI style
-.TP
-.B  \-\-geometry  <geometry>
-sets the client geometry of the main widget - see man X for the argument format
-.SS 
-.SS Qt options:
-.TP
-.B  \-\-display  <displayname>
-Use the X-server display 'displayname'
-.TP
-.B  \-\-session  <sessionId>
-Restore the application for the given 'sessionId'
-.TP
-.B  \-\-cmap  
-Causes the application to install a private color
-map on an 8-bit display
-.TP
-.B  \-\-ncols  <count>
-Limits the number of colors allocated in the color
-cube on an 8-bit display, if the application is
-using the QApplication::ManyColor color
-specification
-.TP
-.B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
-.TP
-.B  \-\-dograb  
-running under a debugger can cause an implicit
--nograb, use -dograb to override
-.TP
-.B  \-\-sync  
-switches to synchronous mode for debugging
-.TP
-.B \-\-fn,  \-\-font  <fontname>
-defines the application font
-.TP
-.B \-\-bg,  \-\-background  <color>
-sets the default background color and an
-application palette (light and dark shades are
-calculated)
-.TP
-.B \-\-fg,  \-\-foreground  <color>
-sets the default foreground color
-.TP
-.B \-\-btn,  \-\-button  <color>
-sets the default button color
-.TP
-.B  \-\-name  <name>
-sets the application name
-.TP
-.B  \-\-title  <title>
-sets the application title (caption)
-.TP
-.B  \-\-visual  TrueColor
-forces the application to use a TrueColor visual on
-an 8-bit display
-.TP
-.B  \-\-inputstyle  <inputstyle>
-sets XIM (X Input Method) input style. Possible
-values are onthespot, overthespot, offthespot and
-root
-.TP
-.B  \-\-im  <XIM server>
-set XIM server
-.TP
-.B  \-\-noxim  
-disable XIM
-.TP
-.B  \-\-reverse  
-mirrors the whole layout of widgets
-.TP
-.B  \-\-stylesheet  
-<file.qss>   applies the Qt stylesheet to the application widgets
-.SS 
-
-.SH SEE ALSO
-Full user documentation is available through the KDE Help Center.  You can also enter the URL
-.BR help:/keditbookmarks/
-directly into konqueror or you can run 
-.BR "`khelpcenter help:/keditbookmarks/'"
-from the command-line.
-.br
-.SH AUTHORS
-.nf
-David Faure <faure at kde.org>
-.br
-Alexander Kellett <lypanov at kde.org>
-.br
-
diff --git a/debian/not-installed b/debian/not-installed
index 84b3809..e69de29 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,8 +0,0 @@
-# Symlinks of private libraries
-./usr/lib/libkbookmarkmodel_private.so
-
-# Manpages are compressed
-./usr/share/man/man1/kbookmarkmerger.1
-
-# These are moved by dh_movelibkdeinit
-./usr/lib/libkdeinit4_keditbookmarks.so
diff --git a/debian/rules b/debian/rules
index 93957ed..6c0507c 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 -DBUILD_kfind=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 -DBUILD_keditbookmarks=false
 
 override_dh_auto_test:
 	# Disable dh_auto_test at build time

-- 
KDE Base Applications module packaging

