kubuntu-packaging

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

  1. calligra-2.6.1-0ubuntu4-fix
  2. Merge into calligra
Proposed by Howard Chan
Status: Merged
Merged at revision: 47
Proposed branch: lp:~smartboyhw/kubuntu-packaging/calligra-2.6.1-0ubuntu4-fix
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/calligra
Diff against target: 59 lines (+15/-8)
3 files modified
debian/calligra-libs.install (+0/-2)
debian/changelog (+9/-0)
debian/control (+6/-6)
To merge this branch: bzr merge lp:~smartboyhw/kubuntu-packaging/calligra-2.6.1-0ubuntu4-fix
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+149595@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/calligra-libs.install'
2--- debian/calligra-libs.install 2013-02-20 11:09:06 +0000
3+++ debian/calligra-libs.install 2013-02-20 15:22:27 +0000
4@@ -47,8 +47,6 @@
5 usr/lib/libkopageapp.so.11.0.0
6 usr/lib/libkoplugin.so.11
7 usr/lib/libkoplugin.so.11.0.0
8-usr/lib/libkdgantt.so.11
9-usr/lib/libkdgantt.so.11.0.0
10 usr/lib/libkoproperty.so.11
11 usr/lib/libkoproperty.so.11.0.0
12 usr/lib/libkoreport.so.11
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-02-20 11:33:51 +0000
16+++ debian/changelog 2013-02-20 15:22:27 +0000
17@@ -1,3 +1,12 @@
18+calligra (1:2.6.1-0ubuntu4) raring; urgency=low
19+
20+ * Remove libkdgantt.so.11 and libkdgantt.so.11.0.0 from
21+ calligra-libs.install to fix conflict with calligraplan
22+ * Updated the control file for calligraplan and calligrawords-common to
23+ break/replace calligra-libs and calligra-data << 1:2.6.1-0ubuntu4
24+
25+ -- Howard Chan <smartboyhw@gmail.com> Wed, 20 Feb 2013 23:16:38 +0800
26+
27 calligra (1:2.6.1-0ubuntu3) raring; urgency=low
28
29 * Really remove librcps_plan.so.11 and librcps_plan.so.11.0.0 from
30
31=== modified file 'debian/control'
32--- debian/control 2013-02-20 11:25:07 +0000
33+++ debian/control 2013-02-20 15:22:27 +0000
34@@ -352,8 +352,8 @@
35 Package: calligraplan
36 Architecture: any
37 Section: kde
38-Breaks: calligra-libs (<< 1:2.6.1-0ubuntu3)
39-Replaces: kplato, calligra-libs (<< 1:2.6.1-0ubuntu3)
40+Breaks: calligra-libs (<< 1:2.6.1-0ubuntu4)
41+Replaces: kplato, calligra-libs (<< 1:2.6.1-0ubuntu4)
42 Conflicts: kplato
43 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
44 Suggests: khelpcenter4
45@@ -401,10 +401,10 @@
46 Architecture: any
47 Section: kde
48 Depends: ${misc:Depends}, ${shlibs:Depends}
49-Breaks: calligrawords (<< 1:2.5.90), calligra-libs (<< 1:2.6.1-0ubuntu3),
50- calligra-data (<< 1:2.6.1-0ubuntu3)
51-Replaces: calligrawords (<< 1:2.5.90), calligra-libs (<< 1:2.6.1-0ubuntu3),
52- calligra-data (<< 1:2.6.1-0ubuntu3)
53+Breaks: calligrawords (<< 1:2.5.90), calligra-libs (<< 1:2.6.1-0ubuntu4),
54+ calligra-data (<< 1:2.6.1-0ubuntu4)
55+Replaces: calligrawords (<< 1:2.5.90), calligra-libs (<< 1:2.6.1-0ubuntu4),
56+ calligra-data (<< 1:2.6.1-0ubuntu4)
57 Description: shared files for calligrawords and calligraauthor
58 This package contains files that are shared by Words and Author.
59 .

Subscribers

People subscribed via source and target branches

to all changes: