rev 12981 - in branches/kde4.2/packages: kdebase-runtime/debian kdebase-workspace/debian kdeplasma-addons/debian phonon/debian soprano/debian
Modestas Vainius
modax-guest at alioth.debian.org
Fri Dec 19 20:58:03 UTC 2008
Author: modax-guest
Date: 2008-12-19 20:58:02 +0000 (Fri, 19 Dec 2008)
New Revision: 12981
Modified:
branches/kde4.2/packages/kdebase-runtime/debian/changelog
branches/kde4.2/packages/kdebase-runtime/debian/control
branches/kde4.2/packages/kdebase-workspace/debian/changelog
branches/kde4.2/packages/kdebase-workspace/debian/control
branches/kde4.2/packages/kdeplasma-addons/debian/changelog
branches/kde4.2/packages/phonon/debian/changelog
branches/kde4.2/packages/phonon/debian/control
branches/kde4.2/packages/soprano/debian/changelog
branches/kde4.2/packages/soprano/debian/control
Log:
Fix more upgrade from KDE 4.1 problems.
Thanks to Marcin Juszkiewicz for the upgrade log.
Modified: branches/kde4.2/packages/kdebase-runtime/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-runtime/debian/changelog 2008-12-19 06:29:38 UTC (rev 12980)
+++ branches/kde4.2/packages/kdebase-runtime/debian/changelog 2008-12-19 20:58:02 UTC (rev 12981)
@@ -1,4 +1,4 @@
-kdebase-runtime (4:4.1.85+svn897816-0r1) UNRELEASED; urgency=low
+kdebase-runtime (4:4.1.85+svn898692-0r2) UNRELEASED; urgency=low
* New upstream development snapshot.
@@ -13,9 +13,9 @@
libpulse-dev.
* Add debian/README.source.
* Update install and installgen files.
- * Drop phonon-backend-xine package. Also make kdebase-runtime not to depend
- on phonon-backend-xine and conflict with previous phonon-backend-xine
- versions (due to moved kcm_phononxine).
+ * Drop phonon-backend-xine package. Also make kdebase-runtime(-data) not to
+ depend on phonon-backend-xine and conflict with previous
+ phonon-backend-xine versions (due to moved kcm_phononxine).
* kdebase-runtime-data replaces kdebase-workspace-data << 4:4.1.85+svn897913
due to moved windowmanagers desktop files and default plasma desktoptheme.
* Switch to new installgen format.
@@ -33,7 +33,7 @@
* Refresh 01_kde4_information_menu.diff.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 17 Dec 2008 14:35:22 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 19 Dec 2008 22:38:30 +0200
kdebase-runtime (4:4.1.3-1) experimental; urgency=low
Modified: branches/kde4.2/packages/kdebase-runtime/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-runtime/debian/control 2008-12-19 06:29:38 UTC (rev 12980)
+++ branches/kde4.2/packages/kdebase-runtime/debian/control 2008-12-19 20:58:02 UTC (rev 12981)
@@ -56,7 +56,7 @@
Depends: kdebase-runtime-data-common (>= ${source:Version}) | kdebase-data (<< 4:4.0.0-1)
Replaces: kdebase-data (<< 4:4.0.0-1), kdebase-bin (<= 4:3.5.8.dfsg.1-2), drkonqi, kdelibs5-data (<< 4:4.1.80),
kdebase-workspace-data (<< 4:4.1.85+svn897913)
-Conflicts: drkonqi
+Conflicts: drkonqi, phonon-backend-xine (<< 4:4.2.80)
Description: shared data files for the KDE 4 base runtime module
This package contains the architecture-independent shared data files needed to
run KDE 4 applications.
Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog 2008-12-19 06:29:38 UTC (rev 12980)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog 2008-12-19 20:58:02 UTC (rev 12981)
@@ -53,7 +53,7 @@
* 23_do_not_depend_on_bindings.diff: do no depend on python-kde4 at build
time (circular build dependency).
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 17 Dec 2008 20:55:36 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 19 Dec 2008 22:11:08 +0200
kdebase-workspace (4:4.1.3-2) experimental; urgency=low
Modified: branches/kde4.2/packages/kdebase-workspace/debian/control
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/control 2008-12-19 06:29:38 UTC (rev 12980)
+++ branches/kde4.2/packages/kdebase-workspace/debian/control 2008-12-19 20:58:02 UTC (rev 12981)
@@ -90,7 +90,8 @@
Depends: ${shlibs:Depends}, kdebase-workspace-libs4+5 (= ${binary:Version}),
libkwineffects1 (= ${binary:Version}), libkdecorations4 (= ${binary:Version}),
${sameVersionDep:kdelibs5-dev:kdebase-workspace-bin}
-Replaces: kdebase-workspace-data (<< 4:4.1.80), ksysguard (<< 4:4.1.80)
+Replaces: kdebase-workspace-data (<< 4:4.1.80), ksysguard (<< 4:4.1.80), libplasma-dev (<< 4:4.1.80),
+ kde-window-manager (<< 4:4.1.80)
Description: development files for the KDE 4 base workspace module
This package contains development files for building software that uses
libraries from the KDE 4 base workspace module.
@@ -99,7 +100,8 @@
Section: kde
Architecture: any
Depends: ${shlibs:Depends}
-Replaces: kdebase-workspace-bin (<< 4:4.1.82), kdebase-workspace-data (<< 4:4.1.82)
+Replaces: kdebase-workspace-bin (<< 4:4.1.82), kdebase-workspace-data (<< 4:4.1.82), libplasma2
+Conflicts: libplasma2
Description: KDE 4 base workspace Plasma data engines
This package contains standard Plasma data engines shipped in KDE 4 base
workspace module. These engines are needed by the standard KDE 4 base
@@ -112,7 +114,8 @@
Section: kde
Architecture: any
Depends: ${shlibs:Depends}, plasma-dataengines-workspace (= ${binary:Version})
-Replaces: kdebase-workspace-bin (<< 4:4.1.82), kdebase-workspace-data (<< 4:4.1.82)
+Replaces: kdebase-workspace-bin (<< 4:4.1.82), kdebase-workspace-data (<< 4:4.1.82), libplasma2
+Conflicts: libplasma2
Description: KDE 4 base workspace Plasma applets and containments
This package contains standard Plasma applets and containments shipped in the
KDE 4 base workspace module. They provide such basic desktop functionality as
Modified: branches/kde4.2/packages/kdeplasma-addons/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeplasma-addons/debian/changelog 2008-12-19 06:29:38 UTC (rev 12980)
+++ branches/kde4.2/packages/kdeplasma-addons/debian/changelog 2008-12-19 20:58:02 UTC (rev 12981)
@@ -1,4 +1,4 @@
-kdeplasma-addons (4:4.1.85+svn897001-0r1) UNRELEASED; urgency=low
+kdeplasma-addons (4:4.1.85+svn897851-0r1) UNRELEASED; urgency=low
* New upstream development snapshot.
@@ -24,7 +24,7 @@
* kdeplasma-addons-libs4 replaces kdeplasma-addons << 4:4.1.80 as
libplasmacomicprovidercore was moved.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 13 Dec 2008 14:11:29 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 17 Dec 2008 14:21:52 +0200
kdeplasma-addons (4:4.1.3-1) experimental; urgency=low
Modified: branches/kde4.2/packages/phonon/debian/changelog
===================================================================
--- branches/kde4.2/packages/phonon/debian/changelog 2008-12-19 06:29:38 UTC (rev 12980)
+++ branches/kde4.2/packages/phonon/debian/changelog 2008-12-19 20:58:02 UTC (rev 12981)
@@ -1,4 +1,4 @@
-phonon (4:4.2.80+svn896612-0r1) UNRELEASED; urgency=low
+phonon (4:4.2.80+svn898997-0r1) UNRELEASED; urgency=low
* New upstream development snapshot.
@@ -8,7 +8,7 @@
* Make xine backend a default one (via phonon metapackage).
* Bump cmake build dependency to 2.6.2.
* Bump Standards-Version to 3.8.0: add README.source.
- * phonon-xine-backend replaces earlier kdebase-runtime.
+ * phonon-xine-backend replaces earlier kde-icons-oxygen.
* Add symbols file for libphonon4. This needs pkg-kde-tools (>= 0.3)
at build time.
- Hook up phonon dependency to play(), stop(), pause() etc. methods.
@@ -22,7 +22,7 @@
* Build-conflict with the experimental libxine-dev (>= 1.1.90) as the
phonon-xine backend cannot build with it.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 14 Dec 2008 00:56:14 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 19 Dec 2008 22:17:13 +0200
phonon (4:4.2.0-2) unstable; urgency=low
Modified: branches/kde4.2/packages/phonon/debian/control
===================================================================
--- branches/kde4.2/packages/phonon/debian/control 2008-12-19 06:29:38 UTC (rev 12980)
+++ branches/kde4.2/packages/phonon/debian/control 2008-12-19 20:58:02 UTC (rev 12981)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Modestas Vainius <modestas at vainius.eu>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.2), pkg-kde-tools (>= 0.3~pre5),
+Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt, cmake (>= 2.6.2), pkg-kde-tools (>= 0.3),
libqt4-dev, automoc, libglu1-mesa-dev, libqt4-opengl-dev, libxml2-dev, libglib2.0-dev,
libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libxine-dev,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
@@ -51,8 +51,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: phonon-backend
-Replaces: kdebase-runtime (<< 4:4.1.73)
-Conflicts: kdebase-runtime (<< 4:4.1.73)
+Replaces: kde-icons-oxygen (<< 4:4.1.80)
Description: Phonon Xine 1.1.x backend
Phonon is the Qt 4 multimedia API, which provides a task-oriented abstraction
layer for capturing, mixing, processing, and playing audio and video content.
Modified: branches/kde4.2/packages/soprano/debian/changelog
===================================================================
--- branches/kde4.2/packages/soprano/debian/changelog 2008-12-19 06:29:38 UTC (rev 12980)
+++ branches/kde4.2/packages/soprano/debian/changelog 2008-12-19 20:58:02 UTC (rev 12981)
@@ -1,4 +1,4 @@
-soprano (2.1.64+svn897713-0r1) UNRELEASED; urgency=low
+soprano (2.1.64+svn897713-0r2) UNRELEASED; urgency=low
* New upstream development snapshot.
@@ -9,9 +9,9 @@
* Switch to new installgen format.
* Update install files.
* Bump shlibs to 2.1.64+svn897713.
- * Move DBus interface XMLs to libsoprano-dev.
+ * Move DBus interface XMLs to libsoprano-dev, add appropriate replaces.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 17 Dec 2008 16:10:10 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 19 Dec 2008 21:57:34 +0200
soprano (2.1.1+dfsg.1-1) unstable; urgency=high
Modified: branches/kde4.2/packages/soprano/debian/control
===================================================================
--- branches/kde4.2/packages/soprano/debian/control 2008-12-19 06:29:38 UTC (rev 12980)
+++ branches/kde4.2/packages/soprano/debian/control 2008-12-19 20:58:02 UTC (rev 12981)
@@ -45,6 +45,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libsoprano4 (= ${binary:Version})
Suggests: libsoprano-doc (= ${source:Version})
+Replaces: libsoprano4 (<< 2.1.64+svn897713)
Description: development files for the Soprano RDF framework
Soprano is a pluggable RDF storage, parsing, and serialization framework based
on Qt 4. Soprano is targeted at desktop applications that need to store RDF
More information about the pkg-kde-commits
mailing list