rev 15195 - trunk/packages/kdebase-runtime/debian

[George Kiagiadakis]

Author: gkiagia-guest
Date: 2009-07-11 20:39:23 +0000 (Sat, 11 Jul 2009)
New Revision: 15195

Modified:
   trunk/packages/kdebase-runtime/debian/changelog
   trunk/packages/kdebase-runtime/debian/control
Log:
Keep in sync with branches/kde4.2 (see r15089).


Modified: trunk/packages/kdebase-runtime/debian/changelog
===================================================================
--- trunk/packages/kdebase-runtime/debian/changelog	2009-07-11 20:24:08 UTC (rev 15194)
+++ trunk/packages/kdebase-runtime/debian/changelog	2009-07-11 20:39:23 UTC (rev 15195)
@@ -25,8 +25,6 @@
   * Drop package kde-icons-oxygen as it was moved to a separate source package.
   * Make kdebase-runtime depend on oxygen-icon-theme (>= 4.2.90),
     instead of kde-icons-oxygen (>= ${source:Version}).
-  * Add replaces: kdebase-runtime-data replaces kde-icons-oxygen (<< 4.2.90)
-    as the oxygen .theme file was moved.
 
   +++ Changes by Sune Vuorela:
 

Modified: trunk/packages/kdebase-runtime/debian/control
===================================================================
--- trunk/packages/kdebase-runtime/debian/control	2009-07-11 20:24:08 UTC (rev 15194)
+++ trunk/packages/kdebase-runtime/debian/control	2009-07-11 20:39:23 UTC (rev 15195)
@@ -58,7 +58,7 @@
 Architecture: all
 Depends: kdebase-runtime-data-common (>= ${source:Version}) | kdebase-data (<< 4:4.0.0-1)
 Replaces: kdebase-data (<< 4:4.2.90), kdebase-bin (<= 4:3.5.8.dfsg.1-2), drkonqi, kdelibs5-data (<< 4:4.1.80),
- kdebase-workspace-data (<< 4:4.1.85+svn897913), akonadi-kde (<< 4:4.2.90), kde-icons-oxygen (<< 4:4.2.90)
+ kdebase-workspace-data (<< 4:4.1.85+svn897913), akonadi-kde (<< 4:4.2.90), kde-icons-oxygen (<= 4:4.2.4-1)
 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