rev 12715 - branches/kde4.2/packages/kdebase/debian

Sun Nov 23 22:51:06 UTC 2008

Author: modax-guest
Date: 2008-11-23 22:51:05 +0000 (Sun, 23 Nov 2008)
New Revision: 12715

Added:
   branches/kde4.2/packages/kdebase/debian/libkonqsidebarplugin4-dev.install
   branches/kde4.2/packages/kdebase/debian/libkonqsidebarplugin4.install
Modified:
   branches/kde4.2/packages/kdebase/debian/changelog
   branches/kde4.2/packages/kdebase/debian/control
   branches/kde4.2/packages/kdebase/debian/installgen
   branches/kde4.2/packages/kdebase/debian/kdebase-bin.install
   branches/kde4.2/packages/kdebase/debian/kdebase-data.install
   branches/kde4.2/packages/kdebase/debian/konqueror.install
Log:
libkonqsidebarplugin. Move konqueror settings back to kdebase-*, kill kdebase-dev

Modified: branches/kde4.2/packages/kdebase/debian/changelog
===================================================================

--- branches/kde4.2/packages/kdebase/debian/changelog	2008-11-23 21:06:27 UTC (rev 12714)
+++ branches/kde4.2/packages/kdebase/debian/changelog	2008-11-23 22:51:05 UTC (rev 12715)
@@ -1,27 +1,29 @@
-kdebase (4:4.1.80+svn888008-0r1) UNRELEASED; urgency=low
+kdebase (4:4.1.80+svn888070-0r2) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
-  TODO: figure out what to put public lib libkonqsidebarplugin, its header,
-  wheather to kill kdebase-dev and where to put kfmclient.
+  TODO: where to put kfmclient.
 
   +++ Changes by Modestas Vainius:
 
-  * Remove kdepimlibs5-dev from kdebase-dev depends.
+  * Drop excess kdepimlibs5-dev build dependency.
   * Use sameVersionDep for libkonq5-dev dependecy on kdelibs5-dev.
   * Bump KDE build dependencies to 4.0.80, dcop implicit cmake build depend.
   * Add explicit kdelibs5-dev build depend (for upcoming symbols files).
   * Bump Standards-Version to 3.8.0: add README.source.
   * Add debian/installgen.
-  * Update and reorganize install files.
-  * Make kappfinder and kdepasswd depend on kdebase-data.
-  * Make kdebase-dev depend only on konqueror.
+  * Update and reorganize install files a bit.
+  * Make kappfinder, kdepasswd and konqueror depend on kdebase-data.
+  * Make konqueror depend on kdebase-bin.
+  * Split off konqueror sidebar library to libkonqsidebarplugin4 and
+    libkonqsidebarplugin4-dev packages.
+  * Kill kdebase-dev package.
 
   +++ Changes by Armin Berres:
 
   * Install konqueror as alternative for x-www-browser. 
 
- -- Modestas Vainius <modestas at vainius.eu>  Sun, 23 Nov 2008 22:56:45 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Nov 2008 00:35:04 +0200
 
 kdebase (4:4.1.3-1) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdebase/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase/debian/control	2008-11-23 21:06:27 UTC (rev 12714)
+++ branches/kde4.2/packages/kdebase/debian/control	2008-11-23 22:51:05 UTC (rev 12715)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>, Modestas Vainius <modestas at vainius.eu>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.2),
- kdelibs5-dev (>= 4:4.1.80), kdepimlibs5-dev (>= 4:4.1.80), libphonon-dev (>= 4:4.2), libplasma-dev (>= 4:4.1.80),
+ kdelibs5-dev (>= 4:4.1.80), libphonon-dev (>= 4:4.2), libplasma-dev (>= 4:4.1.80),
  libqimageblitz-dev (>= 1:0.0.4-2), libsmbclient-dev, libusb-dev, libxkbfile-dev,
  libraw1394-dev, libstreamanalyzer-dev, libxrender-dev, zlib1g-dev, libglu1-mesa-dev,
  libpci-dev, libxt-dev, libxext-dev, pkg-config, libglib2.0-dev
@@ -125,7 +125,7 @@
 Section: web
 Architecture: any
 Provides: info-browser, man-browser, www-browser
-Depends: ${shlibs:Depends},  kdebase-data (>= ${source:Version})
+Depends: ${shlibs:Depends},  kdebase-data (= ${source:Version}), kdebase-bin (= ${binary:Version})
 Suggests: konq-plugins (>= 4:4.1~)
 Recommends: konqueror-nsplugins (= ${binary:Version})
 Description: KDE 4's advanced file manager, web browser and document viewer
@@ -209,6 +209,26 @@
  .
  This package is part of the KDE 4 base applications module.
 
+Package: libkonqsidebarplugin4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Konqueror sidebar plugin library
+ This package contains base library for Konqueror sidebar plugins.
+ .
+ This package is part of the KDE 4 base applications module.
+
+Package: libkonqsidebarplugin4-dev
+Section: libs
+Architecture: any
+Depends: libkonqsidebarplugin4 (= ${binary:Version}),
+ ${sameVersionDep:kdelibs5-dev:libkonqsidebarplugin4}
+Description: Konqueror sidebar plugin library development files
+ This package contains development headers for the Konqueror sidebar plugin
+ library.
+ .
+ This package is part of the KDE 4 base applications module.
+
 Package: kdebase-plasma
 Section: kde
 Architecture: any

Modified: branches/kde4.2/packages/kdebase/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdebase/debian/installgen	2008-11-23 21:06:27 UTC (rev 12714)
+++ branches/kde4.2/packages/kdebase/debian/installgen	2008-11-23 22:51:05 UTC (rev 12715)
@@ -9,11 +9,22 @@
 [libkonq5]
 from:/lib/konq/
 
-[kdebase-dev]
-dst:usr/include
-dst:dbus-1/interfaces
-dst:usr/lib/lib.*\.so$ link:usr/lib/lib.*\.so\.
+[libkonqsidebarplugin4-dev]
+from:/konqueror/sidebar/$ dst:usr/include/
+from:/konqueror/sidebar/$ dst:dbus-1/interfaces
+dst:usr/lib/libkonqsidebarplugin.so$
 
+[libkonqsidebarplugin4]
+from:/konqueror/sidebar/$ dst:usr/lib/[^/]+$
+
+[devel_virtual]
+# Catch missing headers
+stop dst:usr/include
+# Simply miss DBUS interface XMLs. Sorry.
+miss dst:dbus-1/interfaces
+# usr/lib/lib*.so symlinks are safe to miss as long as there are no header files
+miss dst:usr/lib/lib[^/]+\.so$ link:usr/lib/lib[^/]+\.so\.
+
 [dolphin]
 from:/dolphin/
 
@@ -34,6 +45,9 @@
 from:/kinfocenter/
 
 [konqueror]
+# These go to kdebase-bin and kdebase-data since most of them
+# configure all KHTML applications
+skip from:/konqueror/settings/
 from:/konqueror/
 
 [konqueror-nsplugins]
@@ -51,6 +65,7 @@
 [kdebase-bin]
 dst:usr/bin
 dst:usr/lib/libkdeinit4
+dst:usr/lib/kde4/kcm_[^/]+\.so$
 
 [kdebase-data]
 dst:usr/share/

Modified: branches/kde4.2/packages/kdebase/debian/kdebase-bin.install
===================================================================
--- branches/kde4.2/packages/kdebase/debian/kdebase-bin.install	2008-11-23 21:06:27 UTC (rev 12714)
+++ branches/kde4.2/packages/kdebase/debian/kdebase-bin.install	2008-11-23 22:51:05 UTC (rev 12715)
@@ -1,4 +1,12 @@
 usr/bin/kbookmarkmerger
 usr/bin/kdialog
 usr/bin/keditbookmarks
+usr/bin/keditfiletype
+usr/lib/kde4/kcm_css.so
+usr/lib/kde4/kcm_filetypes.so
+usr/lib/kde4/kcm_kio.so
+usr/lib/kde4/kcm_konq.so
+usr/lib/kde4/kcm_konqhtml.so
+usr/lib/kde4/kcm_kurifilt.so
+usr/lib/kde4/kcm_performance.so
 usr/lib/libkdeinit4_keditbookmarks.so

Modified: branches/kde4.2/packages/kdebase/debian/kdebase-data.install
===================================================================
--- branches/kde4.2/packages/kdebase/debian/kdebase-data.install	2008-11-23 21:06:27 UTC (rev 12714)
+++ branches/kde4.2/packages/kdebase/debian/kdebase-data.install	2008-11-23 22:51:05 UTC (rev 12715)
@@ -195,6 +195,9 @@
 usr/share/icons/oxygen/scalable/apps/xclock.svgz
 usr/share/icons/oxygen/scalable/apps/xeyes.svgz
 usr/share/icons/oxygen/scalable/apps/xpaint.svgz
+usr/share/kde4/apps/kcmcss/template.css
+usr/share/kde4/apps/kcontrol/pics/onlyone.png
+usr/share/kde4/apps/kcontrol/pics/overlapping.png
 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
@@ -205,3 +208,50 @@
 usr/share/kde4/apps/keditbookmarks/keditbookmarks-genui.rc
 usr/share/kde4/apps/keditbookmarks/keditbookmarksui.rc
 usr/share/kde4/config.kcfg/keditbookmarks.kcfg
+usr/share/kde4/services/bookmarks.desktop
+usr/share/kde4/services/cache.desktop
+usr/share/kde4/services/cookies.desktop
+usr/share/kde4/services/desktoppath.desktop
+usr/share/kde4/services/ebrowsing.desktop
+usr/share/kde4/services/filebehavior.desktop
+usr/share/kde4/services/filebrowser.desktop
+usr/share/kde4/services/filepreviews.desktop
+usr/share/kde4/services/filetypes.desktop
+usr/share/kde4/services/kcmcss.desktop
+usr/share/kde4/services/kcmkonqyperformance.desktop
+usr/share/kde4/services/kcmperformance.desktop
+usr/share/kde4/services/khtml_behavior.desktop
+usr/share/kde4/services/khtml_filter.desktop
+usr/share/kde4/services/khtml_fonts.desktop
+usr/share/kde4/services/khtml_general.desktop
+usr/share/kde4/services/khtml_java_js.desktop
+usr/share/kde4/services/lanbrowser.desktop
+usr/share/kde4/services/netpref.desktop
+usr/share/kde4/services/proxy.desktop
+usr/share/kde4/services/smb.desktop
+usr/share/kde4/services/useragent.desktop
+usr/share/kde4/services/useragentstrings/firefox15oncurrent.desktop
+usr/share/kde4/services/useragentstrings/firefox20oncurrent.desktop
+usr/share/kde4/services/useragentstrings/googlebot.desktop
+usr/share/kde4/services/useragentstrings/ie401onwinnt4.desktop
+usr/share/kde4/services/useragentstrings/ie50onppc.desktop
+usr/share/kde4/services/useragentstrings/ie55onwinnt5.desktop
+usr/share/kde4/services/useragentstrings/ie60oncurrent.desktop
+usr/share/kde4/services/useragentstrings/ie60onwinnt51.desktop
+usr/share/kde4/services/useragentstrings/lynxoncurrent.desktop
+usr/share/kde4/services/useragentstrings/mozoncurrent.desktop
+usr/share/kde4/services/useragentstrings/mozoncurrent12.desktop
+usr/share/kde4/services/useragentstrings/mozonwinxp.desktop
+usr/share/kde4/services/useragentstrings/nn301oncurrent.desktop
+usr/share/kde4/services/useragentstrings/nn475oncurrent.desktop
+usr/share/kde4/services/useragentstrings/nn475onwin95.desktop
+usr/share/kde4/services/useragentstrings/ns71oncurrent.desktop
+usr/share/kde4/services/useragentstrings/ns71onwinnt51.desktop
+usr/share/kde4/services/useragentstrings/op403onwinnt4.desktop
+usr/share/kde4/services/useragentstrings/op85oncurrent.desktop
+usr/share/kde4/services/useragentstrings/op90oncurrent.desktop
+usr/share/kde4/services/useragentstrings/safari12.desktop
+usr/share/kde4/services/useragentstrings/safari20.desktop
+usr/share/kde4/services/useragentstrings/w3moncurrent.desktop
+usr/share/kde4/services/useragentstrings/wgetoncurrent.desktop
+usr/share/kde4/servicetypes/uasprovider.desktop

Modified: branches/kde4.2/packages/kdebase/debian/konqueror.install
===================================================================
--- branches/kde4.2/packages/kdebase/debian/konqueror.install	2008-11-23 21:06:27 UTC (rev 12714)
+++ branches/kde4.2/packages/kdebase/debian/konqueror.install	2008-11-23 22:51:05 UTC (rev 12715)
@@ -1,14 +1,6 @@
-usr/bin/keditfiletype
 usr/bin/kfmclient
 usr/bin/konqueror
-usr/lib/kde4/kcm_css.so
-usr/lib/kde4/kcm_filetypes.so
 usr/lib/kde4/kcm_history.so
-usr/lib/kde4/kcm_kio.so
-usr/lib/kde4/kcm_konq.so
-usr/lib/kde4/kcm_konqhtml.so
-usr/lib/kde4/kcm_kurifilt.so
-usr/lib/kde4/kcm_performance.so
 usr/lib/kde4/kded_konqy_preloader.so
 usr/lib/kde4/khtmlkttsdplugin.so
 usr/lib/kde4/konq_aboutpage.so
@@ -22,8 +14,6 @@
 usr/lib/kde4/konqsidebar_web.so
 usr/lib/libkdeinit4_kfmclient.so
 usr/lib/libkdeinit4_konqueror.so
-usr/lib/libkonqsidebarplugin.so.4
-usr/lib/libkonqsidebarplugin.so.4.2.0
 usr/lib/libkonquerorprivate.so.4
 usr/lib/libkonquerorprivate.so.4.2.0
 usr/share/applications/kde4/Home.desktop
@@ -69,13 +59,10 @@
 usr/share/kde4/apps/dolphinpart/kpartplugins/kremoteencodingplugin.rc
 usr/share/kde4/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop
 usr/share/kde4/apps/dolphinpart/kpartplugins/kshellcmdplugin.rc
-usr/share/kde4/apps/kcmcss/template.css
 usr/share/kde4/apps/kconf_update/kfmclient_3_2.upd
 usr/share/kde4/apps/kconf_update/kfmclient_3_2_update.sh
 usr/share/kde4/apps/kconf_update/konqsidebartng.upd
 usr/share/kde4/apps/kconf_update/move_konqsidebartng_entries.sh
-usr/share/kde4/apps/kcontrol/pics/onlyone.png
-usr/share/kde4/apps/kcontrol/pics/overlapping.png
 usr/share/kde4/apps/khtml/kpartplugins/khtmlkttsd.desktop
 usr/share/kde4/apps/khtml/kpartplugins/khtmlkttsd.rc
 usr/share/kde4/apps/konqsidebartng/add/virtualfolderadd.desktop
@@ -129,56 +116,9 @@
 usr/share/kde4/apps/konqueror/profiles/webbrowsing
 usr/share/kde4/config.kcfg/konqueror.kcfg
 usr/share/kde4/config/konqsidebartng.rc
-usr/share/kde4/services/bookmarks.desktop
-usr/share/kde4/services/cache.desktop
-usr/share/kde4/services/cookies.desktop
-usr/share/kde4/services/desktoppath.desktop
-usr/share/kde4/services/ebrowsing.desktop
-usr/share/kde4/services/filebehavior.desktop
-usr/share/kde4/services/filebrowser.desktop
-usr/share/kde4/services/filepreviews.desktop
-usr/share/kde4/services/filetypes.desktop
-usr/share/kde4/services/kcmcss.desktop
 usr/share/kde4/services/kcmhistory.desktop
-usr/share/kde4/services/kcmkonqyperformance.desktop
-usr/share/kde4/services/kcmperformance.desktop
 usr/share/kde4/services/kded/konqy_preloader.desktop
-usr/share/kde4/services/khtml_behavior.desktop
-usr/share/kde4/services/khtml_filter.desktop
-usr/share/kde4/services/khtml_fonts.desktop
-usr/share/kde4/services/khtml_general.desktop
-usr/share/kde4/services/khtml_java_js.desktop
 usr/share/kde4/services/konq_aboutpage.desktop
 usr/share/kde4/services/konq_sidebartng.desktop
 usr/share/kde4/services/konqueror.desktop
-usr/share/kde4/services/lanbrowser.desktop
-usr/share/kde4/services/netpref.desktop
-usr/share/kde4/services/proxy.desktop
-usr/share/kde4/services/smb.desktop
-usr/share/kde4/services/useragent.desktop
-usr/share/kde4/services/useragentstrings/firefox15oncurrent.desktop
-usr/share/kde4/services/useragentstrings/firefox20oncurrent.desktop
-usr/share/kde4/services/useragentstrings/googlebot.desktop
-usr/share/kde4/services/useragentstrings/ie401onwinnt4.desktop
-usr/share/kde4/services/useragentstrings/ie50onppc.desktop
-usr/share/kde4/services/useragentstrings/ie55onwinnt5.desktop
-usr/share/kde4/services/useragentstrings/ie60oncurrent.desktop
-usr/share/kde4/services/useragentstrings/ie60onwinnt51.desktop
-usr/share/kde4/services/useragentstrings/lynxoncurrent.desktop
-usr/share/kde4/services/useragentstrings/mozoncurrent.desktop
-usr/share/kde4/services/useragentstrings/mozoncurrent12.desktop
-usr/share/kde4/services/useragentstrings/mozonwinxp.desktop
-usr/share/kde4/services/useragentstrings/nn301oncurrent.desktop
-usr/share/kde4/services/useragentstrings/nn475oncurrent.desktop
-usr/share/kde4/services/useragentstrings/nn475onwin95.desktop
-usr/share/kde4/services/useragentstrings/ns71oncurrent.desktop
-usr/share/kde4/services/useragentstrings/ns71onwinnt51.desktop
-usr/share/kde4/services/useragentstrings/op403onwinnt4.desktop
-usr/share/kde4/services/useragentstrings/op85oncurrent.desktop
-usr/share/kde4/services/useragentstrings/op90oncurrent.desktop
-usr/share/kde4/services/useragentstrings/safari12.desktop
-usr/share/kde4/services/useragentstrings/safari20.desktop
-usr/share/kde4/services/useragentstrings/w3moncurrent.desktop
-usr/share/kde4/services/useragentstrings/wgetoncurrent.desktop
 usr/share/kde4/servicetypes/konqaboutpage.desktop
-usr/share/kde4/servicetypes/uasprovider.desktop

Added: branches/kde4.2/packages/kdebase/debian/libkonqsidebarplugin4-dev.install
===================================================================
--- branches/kde4.2/packages/kdebase/debian/libkonqsidebarplugin4-dev.install	                        (rev 0)
+++ branches/kde4.2/packages/kdebase/debian/libkonqsidebarplugin4-dev.install	2008-11-23 22:51:05 UTC (rev 12715)
@@ -0,0 +1,2 @@
+usr/include/konqsidebarplugin.h
+usr/lib/libkonqsidebarplugin.so

Added: branches/kde4.2/packages/kdebase/debian/libkonqsidebarplugin4.install
===================================================================
--- branches/kde4.2/packages/kdebase/debian/libkonqsidebarplugin4.install	                        (rev 0)
+++ branches/kde4.2/packages/kdebase/debian/libkonqsidebarplugin4.install	2008-11-23 22:51:05 UTC (rev 12715)
@@ -0,0 +1,2 @@
+usr/lib/libkonqsidebarplugin.so.4
+usr/lib/libkonqsidebarplugin.so.4.2.0


