rev 16931 - in trunk/packages/kdelibs/debian: . po

[Modestas Vainius]

Author: modax
Date: 2010-02-13 18:31:59 +0000 (Sat, 13 Feb 2010)
New Revision: 16931

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
   trunk/packages/kdelibs/debian/po/POTFILES.in
Log:
Make kdelibs5-dev conflict with libkwebkit-dev.
Fix debian/po/POTFILES.in.

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2010-02-13 18:15:45 UTC (rev 16930)
+++ trunk/packages/kdelibs/debian/changelog	2010-02-13 18:31:59 UTC (rev 16931)
@@ -42,6 +42,7 @@
     from kdelibs5-data executable.
   * Drop obsolete libplasma-dev provides from kdelibs5-dev.
   * Move kdewidgets.so and kde3supportwidgets.so to kdelibs5-dev.
+  * Make kdelibs5-dev conflict with libkwebkit-dev.
 
   [ Kai Wasserbäch ]
   * debian/patches:

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2010-02-13 18:15:45 UTC (rev 16930)
+++ trunk/packages/kdelibs/debian/control	2010-02-13 18:31:59 UTC (rev 16931)
@@ -460,7 +460,8 @@
 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)
+Conflicts: kdelibs4-dev, libkjsembed-dev, kdepimlibs5-dev (<< 4:4.1.81+svn891439), libplasma-dev (<< 4:4.1.96),
+ libkwebkit-dev
 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.

Modified: trunk/packages/kdelibs/debian/po/POTFILES.in
===================================================================
--- trunk/packages/kdelibs/debian/po/POTFILES.in	2010-02-13 18:15:45 UTC (rev 16930)
+++ trunk/packages/kdelibs/debian/po/POTFILES.in	2010-02-13 18:31:59 UTC (rev 16931)
@@ -1 +1 @@
-[type: gettext/rfc822deb] kdelibs5.templates
+[type: gettext/rfc822deb] libkdecore5.templates