rev 14747 - trunk/packages/kdebase/debian

Josh Metzler jdmetz-guest at alioth.debian.org
Sun May 31 02:47:42 UTC 2009


Author: jdmetz-guest
Date: 2009-05-31 02:47:42 +0000 (Sun, 31 May 2009)
New Revision: 14747

Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
Log:
Make konsole conflict with gtk-qt-engine since they are incompatible.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2009-05-31 02:26:52 UTC (rev 14746)
+++ trunk/packages/kdebase/debian/changelog	2009-05-31 02:47:42 UTC (rev 14747)
@@ -3,6 +3,11 @@
   * New upstream release:
     - khtml fixes. (Closes: #529851)
 
+  +++ Changes by Josh Metzler:
+
+  * Add Conflicts: gtk-qt-engine to konqueror-nsplugins since they are
+    incompatible. (Closes: #513881)
+
   +++ Changes by Sune Vuorela:
 
   * Fix sections.

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2009-05-31 02:26:52 UTC (rev 14746)
+++ trunk/packages/kdebase/debian/control	2009-05-31 02:47:42 UTC (rev 14747)
@@ -143,6 +143,7 @@
 Section: web
 Architecture: any
 Depends: ${shlibs:Depends}
+Conflicts: gtk-qt-engine
 Description: Netscape plugin support for Konqueror
  This package enables Konqueror to use Netscape plugins, such as Flash.
  .




More information about the pkg-kde-commits mailing list