rev 11207 - trunk/packages/kdepim/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-06-29 17:06:21 +0000 (Sun, 29 Jun 2008)
New Revision: 11207

Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/control
Log:
Add Conflicts to kdepim-dev with previous knode versions.



Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2008-06-29 16:43:19 UTC (rev 11206)
+++ trunk/packages/kdepim/debian/changelog	2008-06-29 17:06:21 UTC (rev 11207)
@@ -1,4 +1,4 @@
-kdepim (4:3.5.9-3~unreleased2) UNRELEASED; urgency=low
+kdepim (4:3.5.9-3) unstable; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -19,6 +19,10 @@
   * Make kmailcvt require at least the version of kmail as itself,
     and vice versa. (Closes: #359246)
 
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Add Conflicts to kdepim-dev with previous knode versions. (Closes: #475351)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 24 Jun 2008 15:39:43 +0200
 
 kdepim (4:3.5.9-2) unstable; urgency=low

Modified: trunk/packages/kdepim/debian/control
===================================================================
--- trunk/packages/kdepim/debian/control	2008-06-29 16:43:19 UTC (rev 11206)
+++ trunk/packages/kdepim/debian/control	2008-06-29 17:06:21 UTC (rev 11207)
@@ -46,6 +46,7 @@
 Architecture: any
 Depends: kaddressbook (= ${binary:Version}), kalarm (= ${binary:Version}), kdepim-kresources (= ${binary:Version}), kitchensync (= ${binary:Version}), kmail (= ${binary:Version}), knotes (= ${binary:Version}), kontact (= ${binary:Version}), korganizer (= ${binary:Version}), kpilot (= ${binary:Version}), libkpimidentities1 (= ${binary:Version}), libkcal2-dev (= ${binary:Version}), libkdepim1-dev (= ${binary:Version}), libkgantt0-dev (= ${binary:Version}), libkleopatra1-dev (= ${binary:Version}), libkpimexchange1-dev (= ${binary:Version}), libksieve0-dev (= ${binary:Version}), libktnef1-dev (= ${binary:Version}), libmimelib1-dev (= ${binary:Version})
 Replaces: libkcal2-dev (<< 4:3.4.1), libmimelib1-dev (<< 4:3.4.2)
+Conflicts: knode (<< 4:3.5.9-2)
 Description: KDE Personal Information Management [development]
  This package contains development files needed to compile kdepim applications.
  .