[SCM] Debian Qt/KDE packaging tools branch, master, updated. master/0.4.1-2-g58e6312

Sune Vuorela pusling-guest at alioth.debian.org
Wed Apr 1 20:25:46 UTC 2009


The following commit has been merged in the master branch:
commit 58e63123038ea576d0c06fb8166b839d15fb224a
Author: Sune Vuorela <pusling at eider.killmulehill.net>
Date:   Wed Apr 1 22:25:37 2009 +0200

    Add aggressive conflicts to avoid bad accidents.

diff --git a/debian/changelog b/debian/changelog
index eb858bc..42c83a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pkg-kde-tools (0.4.2) unstable; urgency=low
 
   * Remove setting of kde home. We now use the default.
+  * Add aggressive conflicts to avoid bad accidents.
 
  -- Sune Vuorela <debian at pusling.com>  Wed, 01 Apr 2009 22:23:23 +0200
 
diff --git a/debian/control b/debian/control
index 2e7dae6..3e3e005 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=summary
 Package: pkg-kde-tools
 Architecture: all
 Depends: ${perl:Depends}
+Conflicts: kdelibs5-dev (<< 4.2.2)
 Suggests: debhelper (>= 7), cdbs, dpkg-dev
 Description: common makesnippets and build scripts for KDE4 related packages
  This package contains makefiles setting the default build arguments for KDE4

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list