KDE_3_4_BRANCH: kdesdk/debian

[Ben Burton <bab@debian.org>]

CVS commit by benb: 

Shift around versioned cvs dependencies.


  M +3 -0      changelog   1.60.4.6
  M +1 -2      control   1.61.4.5


--- kdesdk/debian/changelog  #1.60.4.5:1.60.4.6
@@ -4,4 +4,7 @@
   * Note that although libktnef.la has moved from kdepim-dev to libktnef1-dev,
     a build-dependency on kdepim-dev is still required for some header files.
+  * Removed cvs dependency from cervisia, since this comes indirectly through
+    libcvsservice0 anyway.  Updated the cvs dependency for libcvsservice
+    to require cvs (>= 1.11), as cervisia used to when it handled cvs itself.
   * Removed obsolete kderemove tags from menu items.
 

--- kdesdk/debian/control  #1.61.4.4:1.61.4.5
@@ -40,5 +40,4 @@
 Section: devel
 Depends: ${shlibs:Depends}
-Recommends: cvs (>= 1.11)
 Suggests: khelpcenter, kdesdk-doc-html
 Description: a graphical CVS front end for KDE
@@ -253,5 +252,5 @@
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, cvs
+Depends: ${shlibs:Depends}, cvs (>= 1.11)
 Recommends: kdelibs-bin
 Replaces: cervisia (<< 4:3.2.0)