rev 12753 - branches/kde4.2/packages/kdebase/debian
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Fri Nov 28 13:54:59 UTC 2008
Author: gkiagia-guest
Date: 2008-11-28 13:54:58 +0000 (Fri, 28 Nov 2008)
New Revision: 12753
Modified:
branches/kde4.2/packages/kdebase/debian/changelog
branches/kde4.2/packages/kdebase/debian/control
Log:
New snapshot.
Changes:
* konqueror recommends dolphin as it needs the dolphinpart to do file management.
* libkonqsidebarplugin4-dev conflicts and replaces kdebase-dev.
* Add some replaces to fix the following upgrade errors:
dpkg: error processing dolphin_4.1.80+svn889834-0r1_amd64.deb (--install):
trying to overwrite `/usr/lib/kde4/kcm_dolphin.so', which is also in package kdebase-bin
dpkg: error processing dolphin_4.1.80+svn890046-0r1_amd64.deb (--install):
trying to overwrite `/usr/share/kde4/services/kcmdolphin.desktop', which is also in package kdebase-data
dpkg: error processing konqueror_4.1.80+svn889834-0r1_amd64.deb (--install):
trying to overwrite `/usr/share/kde4/apps/dolphinpart/kpartplugins/kshellcmdplugin.desktop', which is also in package dolphin
dpkg: error processing libkonqsidebarplugin4-dev_4.1.80+svn889834-0r1_amd64.deb (--install):
trying to overwrite `/usr/include/konqsidebarplugin.h', which is also in package konqueror
Modified: branches/kde4.2/packages/kdebase/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase/debian/changelog 2008-11-28 13:14:06 UTC (rev 12752)
+++ branches/kde4.2/packages/kdebase/debian/changelog 2008-11-28 13:54:58 UTC (rev 12753)
@@ -1,4 +1,4 @@
-kdebase (4:4.1.80+svn889070-0r1) UNRELEASED; urgency=low
+kdebase (4:4.1.80+svn890046-0r1) UNRELEASED; urgency=low
* New upstream development snapshot.
@@ -23,8 +23,16 @@
* Install konqueror as alternative for x-www-browser.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 26 Nov 2008 03:52:02 +0200
+ +++ Changes by George Kiagiadakis:
+ * konqueror recommends dolphin as it needs the dolphinpart to
+ do file management.
+ * libkonqsidebarplugin4-dev conflicts and replaces kdebase-dev.
+ * Add some replaces to fix upgrade errors, as some files were
+ moved between packages.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 28 Nov 2008 13:43:04 +0000
+
kdebase (4:4.1.3-1) experimental; urgency=low
* New upstream release
Modified: branches/kde4.2/packages/kdebase/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase/debian/control 2008-11-28 13:14:06 UTC (rev 12752)
+++ branches/kde4.2/packages/kdebase/debian/control 2008-11-28 13:54:58 UTC (rev 12753)
@@ -36,6 +36,7 @@
Section: utils
Architecture: any
Depends: ${shlibs:Depends}
+Replaces: kdebase-bin (<< 4:4.1.80), kdebase-data (<< 4:4.1.80)
Recommends: kfind
Description: file manager for KDE 4
Dolphin is the default KDE 4 file manager, intended to be both powerful and
@@ -128,8 +129,9 @@
Architecture: any
Provides: info-browser, man-browser, www-browser
Depends: ${shlibs:Depends}, kdebase-data (= ${source:Version}), kdebase-bin (= ${binary:Version})
+Replaces: dolphin (<< 4:4.1.80)
Suggests: konq-plugins (>= 4:4.1~)
-Recommends: konqueror-nsplugins (= ${binary:Version})
+Recommends: konqueror-nsplugins (= ${binary:Version}), dolphin
Description: KDE 4's advanced file manager, web browser and document viewer
Konqueror is the KDE web browser and advanced file manager.
.
@@ -226,6 +228,8 @@
Architecture: any
Depends: libkonqsidebarplugin4 (= ${binary:Version}),
${sameVersionDep:kdelibs5-dev:libkonqsidebarplugin4}
+Replaces: konqueror (<< 4:4.1.80), kdebase-dev
+Conflicts: kdebase-dev
Description: Konqueror sidebar plugin library development files
This package contains development headers for the Konqueror sidebar plugin
library.
More information about the pkg-kde-commits
mailing list