Merge lp:~smartboyhw/kubuntu-packaging/calligra-2.6.1-0ubuntu4-fix into lp:~kubuntu-packagers/kubuntu-packaging/calligra

[Howard Chan]

New version needed for calligra 2.6.1 (1:2.6.1-0ubuntu4) since calligra-libs and calligraplan clashed AGAIN.

=== modified file 'debian/calligra-libs.install'
--- debian/calligra-libs.install	2013-02-20 11:09:06 +0000
+++ debian/calligra-libs.install	2013-02-20 15:22:27 +0000
@@ -47,8 +47,6 @@
 usr/lib/libkopageapp.so.11.0.0
 usr/lib/libkoplugin.so.11
 usr/lib/libkoplugin.so.11.0.0
-usr/lib/libkdgantt.so.11
-usr/lib/libkdgantt.so.11.0.0
 usr/lib/libkoproperty.so.11
 usr/lib/libkoproperty.so.11.0.0
 usr/lib/libkoreport.so.11
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-02-20 11:33:51 +0000
+++ debian/changelog	2013-02-20 15:22:27 +0000
@@ -1,3 +1,12 @@
+calligra (1:2.6.1-0ubuntu4) raring; urgency=low
+
+  * Remove libkdgantt.so.11 and libkdgantt.so.11.0.0 from 
+    calligra-libs.install to fix conflict with calligraplan
+  * Updated the control file for calligraplan and calligrawords-common to 
+    break/replace calligra-libs and calligra-data << 1:2.6.1-0ubuntu4
+
+ -- Howard Chan <[e-mail]>  Wed, 20 Feb 2013 23:16:38 +0800
+
 calligra (1:2.6.1-0ubuntu3) raring; urgency=low
 
   * Really remove librcps_plan.so.11 and librcps_plan.so.11.0.0 from 
 
=== modified file 'debian/control'
--- debian/control	2013-02-20 11:25:07 +0000
+++ debian/control	2013-02-20 15:22:27 +0000
@@ -352,8 +352,8 @@
 Package: calligraplan
 Architecture: any
 Section: kde
-Breaks: calligra-libs (<< 1:2.6.1-0ubuntu3)
-Replaces: kplato, calligra-libs (<< 1:2.6.1-0ubuntu3)
+Breaks: calligra-libs (<< 1:2.6.1-0ubuntu4)
+Replaces: kplato, calligra-libs (<< 1:2.6.1-0ubuntu4)
 Conflicts: kplato
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Suggests: khelpcenter4
@@ -401,10 +401,10 @@
 Architecture: any
 Section: kde
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: calligrawords (<< 1:2.5.90), calligra-libs (<< 1:2.6.1-0ubuntu3),
- calligra-data (<< 1:2.6.1-0ubuntu3)
-Replaces: calligrawords (<< 1:2.5.90), calligra-libs (<< 1:2.6.1-0ubuntu3), 
- calligra-data (<< 1:2.6.1-0ubuntu3)
+Breaks: calligrawords (<< 1:2.5.90), calligra-libs (<< 1:2.6.1-0ubuntu4),
+ calligra-data (<< 1:2.6.1-0ubuntu4)
+Replaces: calligrawords (<< 1:2.5.90), calligra-libs (<< 1:2.6.1-0ubuntu4), 
+ calligra-data (<< 1:2.6.1-0ubuntu4)
 Description: shared files for calligrawords and calligraauthor
  This package contains files that are shared by Words and Author.
  .