KDE_3_2_BRANCH: kdesdk/debian

[Ben Burton <bab@debian.org>]

CVS commit by benb: 

Add conflicts/replaces for umbrello-manual.


  M +6 -0      changelog   1.53.2.5
  M +2 -0      control   1.54.2.5


--- kdesdk/debian/control  #1.54.2.4:1.54.2.5
@@ -274,4 +274,6 @@
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter, kdesdk-doc-html
+Conflicts: umbrello-manual (<< 20040311)
+Replaces: umbrello-manual (<< 20040311)
 Description: UML modelling tool and code generator
  Umbrello UML Modeller is a Unified Modelling Language editor for KDE.

--- kdesdk/debian/changelog  #1.53.2.4:1.53.2.5
@@ -1,2 +1,8 @@
+kdesdk (4:3.2.1-2) unstable; urgency=low
+
+  * Add conflicts/replaces for umbrello-manual (closes: #237173).
+
+ -- Ben Burton <bab@debian.org>  Thu, 11 Mar 2004 09:20:36 +1100
+
 kdesdk (4:3.2.1-1) unstable; urgency=low