[SCM] Kaboom - Debian KDE 3->4 migration tool branch, master, updated. master/0.9.1-18-g862cb47

[Sune Vuorela]

The following commit has been merged in the master branch:
commit 862cb475c3ae6fb5e42f9173965952e731f6c255
Author: Sune Vuorela <pusling at eider.killmulehill.net>
Date:   Wed Apr 1 22:32:02 2009 +0200

    Do aggressive conflicts as extra safety.

diff --git a/debian/changelog b/debian/changelog
index cca7f1b..b839369 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kaboom (1.0.0) unstable; urgency=low
 
   * Let us go live with kaboom. Default to .kde and .kde4. 
     And do touch-file on exit.
+  * Do aggressive conflicts as extra safety.
 
  -- Sune Vuorela <debian at pusling.com>  Wed, 01 Apr 2009 22:28:07 +0200
 
diff --git a/debian/control b/debian/control
index f9329ea..67a9d0e 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Standards-Version: 3.8.0
 
 Package: kaboom
 Architecture: any
+Conflicts: kdelibs5 (<< 4:4.2.2)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: The Debian KDE settings migration tool
  This is a tool that will help you migrate your KDE settings from KDE 3 

-- 
Kaboom - Debian KDE 3->4 migration tool