[SCM] Debian Qt/KDE packaging tools branch, experimental, updated. master/0.4.2-9-ga96bd7f

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit a89ca876c2f690245dd4e9d2413f739e1d2ef599
Merge: 5924852ba1492d5fc545b74c5199e7b223114a4b 734659d3d230ea09476d421b063b5149562c89b8
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Apr 11 14:55:26 2009 +0300

    Merge branch 'master' into experimental.
    
    Conflicts:
    	debian/changelog
    	debian/control

diff --combined debian/changelog
index 07c4753,42c83a6..9659f93
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,18 @@@
 +pkg-kde-tools (0.4.5) experimental; urgency=low
 +
 +  * Restore pkgkde-symbolshelper compatibility with dpkg-dev 1.15.0. This
 +    breaks compatibility with dpkg-dev (<< 1.15) though. Add conflicts.
 +  * Small dpkg-dev 1.15.0 compatibility fix for dh_sameversiondep.
 +
 + -- Modestas Vainius <modestas at vainius.eu>  Sun, 29 Mar 2009 15:26:12 +0300
 +
+ 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
+ 
  pkg-kde-tools (0.4.1) unstable; urgency=low
  
    * Add Vcs fields to debian/control (Git).
diff --combined debian/control
index 5ead296,d857452..ca56bc1
--- a/debian/control
+++ b/debian/control
@@@ -12,8 -12,8 +12,8 @@@ Vcs-Browser: http://git.debian.org/?p=p
  Package: pkg-kde-tools
  Architecture: all
  Depends: ${perl:Depends}
 -Conflicts: kdelibs5-dev (<< 4:4.2.2)
 -Suggests: debhelper (>= 7), cdbs, dpkg-dev
 +Suggests: debhelper (>= 7), cdbs, dpkg-dev (>= 1.15.0)
- Conflicts: dpkg-dev (<< 1.15.0)
++Conflicts: dpkg-dev (<< 1.15.0), kdelibs5-dev (<< 4:4.2.2)
  Description: common makesnippets and build scripts for KDE4 related packages
   This package contains makefiles setting the default build arguments for KDE4
   packages.

-- 
Debian Qt/KDE packaging tools