rev 17984 - trunk/packages/kdelibs/debian

[Modestas Vainius]

Author: modax
Date: 2010-05-15 09:21:52 +0000 (Sat, 15 May 2010)
New Revision: 17984

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
Log:
Restore kdelibs5-dev installability with libkwebkit-dev (>= 0.9svn1123738).

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-05-15 09:11:27 UTC (rev 17983)
+++ trunk/packages/kdelibs/debian/changelog	2010-05-15 09:21:52 UTC (rev 17984)
@@ -1,6 +1,7 @@
 kde4libs (4:4.4.3-2) UNRELEASED; urgency=low
 
   * Confirm symbol files for 4.4.3 on all arches except alpha.
+  * Restore kdelibs5-dev installability with libkwebkit-dev (>= 0.9svn1123738).
 
  -- Modestas Vainius <modax at debian.org>  Tue, 04 May 2010 11:17:33 +0300
 

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2010-05-15 09:11:27 UTC (rev 17983)
+++ trunk/packages/kdelibs/debian/control	2010-05-15 09:21:52 UTC (rev 17984)
@@ -465,11 +465,12 @@
  ${sameVersionDep:libqt4-dev:kdelibs5-plugins}, ${sameVersionDep:libsoprano-dev:libnepomuk4},
  ${sameVersionDep:libphonon-dev:libkhtml5}
 Recommends: ${sameVersionDep:libqt4-opengl-dev:libplasma3-Depends}
-Replaces: kdebase-runtime-data (<< 4:4.2.90), kdelibs5-data (<< 4:4.0.80-1), libplasma-dev (<< 4:4.1.96),
- kdebase-workspace-dev (<< 4:4.4.0), kdelibs5 (<< 4:4.4.0)
-Conflicts: kdelibs4-dev, libkjsembed-dev, kdepimlibs5-dev (<< 4:4.1.81+svn891439), libplasma-dev (<< 4:4.1.96),
- libkwebkit-dev
-Breaks: cmake (<< 2.6.3)
+Replaces: kdebase-runtime-data (<< 4:4.2.90), kdelibs5-data (<< 4:4.0.80-1),
+ libplasma-dev (<< 4:4.1.96), kdebase-workspace-dev (<< 4:4.4.0),
+ kdelibs5 (<< 4:4.4.0), libkwebkit-dev (<< 0.9svn1123738)
+Conflicts: kdelibs4-dev, libkjsembed-dev, kdepimlibs5-dev (<< 4:4.1.81+svn891439),
+ libplasma-dev (<< 4:4.1.96)
+Breaks: cmake (<< 2.6.3), libkwebkit-dev (<< 0.9svn1123738)
 Description: development files for the KDE Development Platform libraries
  This package contains development files for building KDE Applications and
  other software that uses the KDE Development Platform libraries.