rev 13694 - branches/kde4.2/packages/kdegraphics/debian

[Pino Toscano]

Author: pino-guest
Date: 2009-02-01 14:30:17 +0000 (Sun, 01 Feb 2009)
New Revision: 13694

Modified:
   branches/kde4.2/packages/kdegraphics/debian/changelog
   branches/kde4.2/packages/kdegraphics/debian/control
Log:
fix conflict of kolourpaint4 with kolourpaint


Modified: branches/kde4.2/packages/kdegraphics/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdegraphics/debian/changelog	2009-02-01 14:15:31 UTC (rev 13693)
+++ branches/kde4.2/packages/kdegraphics/debian/changelog	2009-02-01 14:30:17 UTC (rev 13694)
@@ -1,3 +1,11 @@
+kdegraphics (4:4.2.0-2) UNRELEASED; urgency=low
+
+  +++ Changes by Pino Toscano:
+
+  * Make kolourpaint4 conflict with kolourpaint, not with itself.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Feb 2009 15:29:13 +0100
+
 kdegraphics (4:4.2.0-1) experimental; urgency=low
 
   * New upstream release.

Modified: branches/kde4.2/packages/kdegraphics/debian/control
===================================================================
--- branches/kde4.2/packages/kdegraphics/debian/control	2009-02-01 14:15:31 UTC (rev 13693)
+++ branches/kde4.2/packages/kdegraphics/debian/control	2009-02-01 14:30:17 UTC (rev 13694)
@@ -111,7 +111,7 @@
 Package: kolourpaint4
 Section: graphics
 Architecture: any
-Conflicts: kolourpaint4
+Conflicts: kolourpaint
 Replaces: kolourpaint
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: simple image editor for KDE 4