Merge lp:~debfx/kdegraphics/ubuntu into lp:~kubuntu-packagers/kubuntu-packaging/kdegraphics

[Felix Geyer]

kdegraphics-libs-data: drop libkdcraw8 and libkipi7 from conflicts/replaces.

[Jonathan Thomas (echidnaman)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-19 19:41:44 +0000
+++ debian/changelog	2010-05-21 18:39:25 +0000
@@ -1,3 +1,9 @@
+kdegraphics (4:4.4.3-1ubuntu2) maverick; urgency=low
+
+  * kdegraphics-libs-data: drop libkdcraw8 and libkipi7 from conflicts/replaces.
+
+ -- Felix Geyer <[e-mail]>  Fri, 21 May 2010 20:28:43 +0200
+
 kdegraphics (4:4.4.3-1ubuntu1) maverick; urgency=low
 
   * Merge with Debian Unstable, remaining changes:

=== modified file 'debian/control'
--- debian/control	2010-05-19 19:41:44 +0000
+++ debian/control	2010-05-21 18:39:25 +0000
@@ -40,8 +40,8 @@
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: libkdcraw7, libkdcraw8, libkipi0, libkipi6, libkipi7
-Replaces: libkdcraw7, libkdcraw8, libkipi6, libkipi7, libksane0 (<< 4:4.4.60)
+Conflicts: libkdcraw5, libkdcraw7, libkipi0, libkipi5, libkipi6
+Replaces: libkdcraw5, libkdcraw7, libkipi5, libkipi6, libksane0 (<< 4:4.4.60)
 Description: data files for libraries from the kdegraphics module
  This package contains data files needed by libraries built from the KDE
  graphics module.