rev 11931 - kde-extras/konq-plugins/trunk/debian

[Xavier Vello]

Author: wdgt-guest
Date: 2008-08-17 17:02:16 +0000 (Sun, 17 Aug 2008)
New Revision: 11931

Modified:
   kde-extras/konq-plugins/trunk/debian/changelog
   kde-extras/konq-plugins/trunk/debian/control
Log:
add conflict: kde-i18n


Modified: kde-extras/konq-plugins/trunk/debian/changelog
===================================================================
--- kde-extras/konq-plugins/trunk/debian/changelog	2008-08-16 19:48:32 UTC (rev 11930)
+++ kde-extras/konq-plugins/trunk/debian/changelog	2008-08-17 17:02:16 UTC (rev 11931)
@@ -1,3 +1,9 @@
+konq-plugins (4:4.1.0-2) UNRELEASED; urgency=low
+
+  * Add conflict with kde-i18n (KDE3 translations included konq-plugins)
+
+ -- Xavier Vello <xavier.vello at gmail.com>  Sun, 17 Aug 2008 19:00:43 +0200
+
 konq-plugins (4:4.1.0-1) experimental; urgency=low
 
   * Upstream tarball, no new features since svn r831101.

Modified: kde-extras/konq-plugins/trunk/debian/control
===================================================================
--- kde-extras/konq-plugins/trunk/debian/control	2008-08-16 19:48:32 UTC (rev 11930)
+++ kde-extras/konq-plugins/trunk/debian/control	2008-08-17 17:02:16 UTC (rev 11931)
@@ -9,6 +9,7 @@
 Package: konq-plugins
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, konqueror (>= 4:4.1.0), python, libjpeg-progs
+Conflicts: kde-i18n
 Enhances: konqueror
 Recommends: imagemagick
 Description: plugins for Konqueror, the KDE file/web/doc browser
@@ -38,4 +39,4 @@
  These plugins are not part of the official KDE4 desktop, they are a
  extragear software and may get out of sync of konqueror.
  .
- Note : some plugins have been disabled. See README.Debian
\ No newline at end of file
+ Note : some plugins have been disabled. See README.Debian