[SCM] KDE Admin module packaging branch, kde4.5, updated. debian/4.4.5-3-7-g358b287

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Wed Sep 15 02:02:05 UTC 2010


The following commit has been merged in the kde4.5 branch:
commit 358b287ccc459d034956a01ab54b0f4b6521de3e
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Sep 15 01:35:30 2010 +0000

    kde-config-cron breaks kcron (<< 4:4.4) rather than conflicts
---
 debian/changelog |    3 ++-
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b00c298..6806016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,8 @@ kdeadmin (4:4.5.1-0r1) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Bump KDE build dependencies to 4:4.5.
   * Update installed files.
-  * Bump to Standards-Version 3.9.1, no changes needed.
+  * Bump to Standards-Version 3.9.1:
+    - kde-config-cron breaks kcron (<< 4:4.4) rather than conflicts.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sat, 11 Sep 2010 20:07:52 +0000
 
diff --git a/debian/control b/debian/control
index 82a2997..c4e2aef 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, cron | anacron
 Suggests: khelpcenter4
-Conflicts: kcron (<< 4:4.4)
+Breaks: kcron (<< 4:4.4)
 Replaces: kcron (<< 4:4.4)
 Description: program scheduler frontend
  kde-config-cron is a KDE configuration module for scheduling programs to run

-- 
KDE Admin module packaging



More information about the pkg-kde-commits mailing list