[SCM] KDE Base Applications module packaging branch, kde4.4, updated. debian/4.4.5-2-3-g8c98047
Modestas Vainius
modax at alioth.debian.org
Tue Mar 29 00:19:53 UTC 2011
The following commit has been merged in the kde4.4 branch:
commit c7e5afa5c9938c7013e33a7b979a4cace0303941
Author: Modestas Vainius <modax at debian.org>
Date: Tue Mar 29 03:02:38 2011 +0300
Split off support files from libkonq5 to the libkonq-common package,
Also make libkonq5 depend on libkonq-common.
This is needed for better co-installability with KDE SC 4.6.
---
debian/changelog | 3 +++
debian/control | 14 +++++++++++++-
.../{libkonq5.install => libkonq-common.install} | 2 --
debian/libkonq5.install | 12 ------------
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2cb3480..104193e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
kdebase (4:4.4.5-3) UNRELEASED; urgency=low
+ * Split off support files from libkonq5 to the libkonq-common package and
+ make libkonq5 depend on libkonq-common. This is needed for better
+ co-installability with KDE SC 4.6.
-- Modestas Vainius <modax at debian.org> Tue, 29 Mar 2011 02:45:05 +0300
diff --git a/debian/control b/debian/control
index 40d20d3..095ae1a 100644
--- a/debian/control
+++ b/debian/control
@@ -180,7 +180,7 @@ Description: simple graphical text editor
Package: libkonq5
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libkonq5-templates
+Depends: ${shlibs:Depends}, ${misc:Depends}, libkonq-common (>= ${binary:Version})
Replaces: kdebase-data (<< 4:4.1.80), kdebase-bin (<< 4:4.1.80)
Description: core libraries for Konqueror
This package contains libraries used by several KDE 4 applications,
@@ -188,6 +188,18 @@ Description: core libraries for Konqueror
.
This package is part of the KDE base applications module.
+Package: libkonq-common
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libkonq5-templates
+Replaces: libkonq5 (<< 4:4.4.5-3)
+Breaks: libkonq5 (<< 4:4.4.5-3)
+Description: core Konqueror library - support files
+ This package contains plugins and data files used by the core Konqueror
+ library (libkonq).
+ .
+ This package is part of the KDE base applications module.
+
Package: libkonq5-templates
Section: libs
Architecture: all
diff --git a/debian/libkonq5.install b/debian/libkonq-common.install
similarity index 92%
copy from debian/libkonq5.install
copy to debian/libkonq-common.install
index d9a4692..13d126c 100644
--- a/debian/libkonq5.install
+++ b/debian/libkonq-common.install
@@ -1,7 +1,5 @@
usr/lib/kde4/kded_favicons.so
usr/lib/kde4/konq_sound.so
-usr/lib/libkonq.so.5
-usr/lib/libkonq.so.5.4.0
usr/share/kde4/apps/kbookmark/directory_bookmarkbar.desktop
usr/share/kde4/apps/kconf_update/favicons.upd
usr/share/kde4/apps/kconf_update/move_favicons.sh
diff --git a/debian/libkonq5.install b/debian/libkonq5.install
index d9a4692..1e3927e 100644
--- a/debian/libkonq5.install
+++ b/debian/libkonq5.install
@@ -1,14 +1,2 @@
-usr/lib/kde4/kded_favicons.so
-usr/lib/kde4/konq_sound.so
usr/lib/libkonq.so.5
usr/lib/libkonq.so.5.4.0
-usr/share/kde4/apps/kbookmark/directory_bookmarkbar.desktop
-usr/share/kde4/apps/kconf_update/favicons.upd
-usr/share/kde4/apps/kconf_update/move_favicons.sh
-usr/share/kde4/apps/konqueror/pics/arrow_bottomleft.png
-usr/share/kde4/apps/konqueror/pics/arrow_bottomright.png
-usr/share/kde4/apps/konqueror/pics/arrow_topleft.png
-usr/share/kde4/apps/konqueror/pics/arrow_topright.png
-usr/share/kde4/services/kded/favicons.desktop
-usr/share/kde4/servicetypes/konqdndpopupmenuplugin.desktop
-usr/share/kde4/servicetypes/konqpopupmenuplugin.desktop
--
KDE Base Applications module packaging
More information about the pkg-kde-commits
mailing list