diff -Nru libkipi-4.8.4/debian/changelog libkipi-4.8.5/debian/changelog
--- libkipi-4.8.4/debian/changelog	2012-06-23 20:42:08.000000000 +0000
+++ libkipi-4.8.5/debian/changelog	2012-09-07 14:53:27.000000000 +0000
@@ -1,3 +1,14 @@
+libkipi (4:4.8.5-0ubuntu0.1) precise-proposed; urgency=low
+
+  [ Scott Kitterman ]
+  * New upstream bugfix release (LP: #1047417)
+
+  [ Felix Geyer ]
+  * Make libkipi-data break/replace libkipi7 due to file conflicts.
+    (LP: #1041766)
+
+ -- Felix Geyer <debfx@ubuntu.com>  Fri, 07 Sep 2012 16:53:26 +0200
+
 libkipi (4:4.8.4-0ubuntu0.1) precise-proposed; urgency=low
 
   * New upstream release (LP: #1007798)
diff -Nru libkipi-4.8.4/debian/control libkipi-4.8.5/debian/control
--- libkipi-4.8.4/debian/control	2012-06-02 18:26:16.000000000 +0000
+++ libkipi-4.8.5/debian/control	2012-08-28 09:04:57.000000000 +0000
@@ -4,7 +4,7 @@
 XSBC-Original-Maintainer: Rohan Garg <rohangarg@kubuntu.org>
 Build-Depends: cmake,
                debhelper (>= 7.0.50~),
-               kde-sc-dev-latest (>= 4:4.8.4),
+               kde-sc-dev-latest (>= 4:4.8.5),
                kdelibs5-dev (>= 4:4.8.1),
                pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.2
@@ -47,8 +47,9 @@
           libkdcraw5,
           libkipi0,
           libkipi5,
-          libkipi6
-Breaks: kdegraphics-libs-data (<< 4:4.6.80), libkipi0, libkipi5, libkipi6
+          libkipi6,
+          libkipi7
+Breaks: kdegraphics-libs-data (<< 4:4.6.80), libkipi0, libkipi5, libkipi6, libkipi7
 Description: data files for kipi libraries
  This package contains data files needed by libraries built from the kipi
  library.