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

Proposed by Howard Chan
Status: Merged
Merged at revision: 48
Proposed branch: lp:~smartboyhw/kubuntu-packaging/calligra-2.6.1-0ubuntu5-fix
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/calligra
Diff against target: 124 lines (+18/-1)
10 files modified
debian/calligraauthor.install (+1/-0)
debian/calligraflow.install (+1/-0)
debian/calligraplan.install (+2/-0)
debian/calligrasheets.install (+1/-0)
debian/calligrastage.install (+1/-0)
debian/calligrawords-common.install (+1/-0)
debian/changelog (+8/-0)
debian/karbon.install (+1/-0)
debian/krita.install (+1/-0)
debian/not-installed (+1/-1)
To merge this branch: bzr merge lp:~smartboyhw/kubuntu-packaging/calligra-2.6.1-0ubuntu5-fix
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+149789@code.launchpad.net

Description of the change

Since all the libkdeinit4_*.so files are missing from the .install files, I updated it AGAIN to -0ubuntu5.

To post a comment you must log in.
49. By Howard Chan

Fixed debian/control and debian/not-installed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/calligraauthor.install'
2--- debian/calligraauthor.install 2013-02-19 15:16:29 +0000
3+++ debian/calligraauthor.install 2013-02-21 10:52:20 +0000
4@@ -1,5 +1,6 @@
5 usr/bin/calligraauthor
6 usr/lib/kde4/authorpart.so
7+usr/lib/libkdeinit4_calligraauthor.so
8 usr/share/applications/kde4/author.desktop
9 usr/share/kde4/apps/author/author.rc
10 usr/share/kde4/apps/author/author_readonly.rc
11
12=== modified file 'debian/calligraflow.install'
13--- debian/calligraflow.install 2013-02-19 15:16:29 +0000
14+++ debian/calligraflow.install 2013-02-21 10:52:20 +0000
15@@ -3,6 +3,7 @@
16 usr/lib/kde4/flowpart.so
17 usr/lib/libflowprivate.so.11
18 usr/lib/libflowprivate.so.11.0.0
19+usr/lib/libkdeinit4_calligraflow.so
20 usr/share/applications/kde4/flow.desktop
21 usr/share/kde4/services/ServiceMenus/flow_print.desktop
22 usr/share/kde4/services/flowdockersplugin.desktop
23
24=== modified file 'debian/calligraplan.install'
25--- debian/calligraplan.install 2013-02-19 15:16:29 +0000
26+++ debian/calligraplan.install 2013-02-21 10:52:20 +0000
27@@ -8,6 +8,8 @@
28 usr/lib/kde4/plantjscheduler.so
29 usr/lib/kde4/planworkpart.so
30 usr/lib/libkplatokernel.so.11
31+usr/lib/libkdeinit4_calligraplan.so
32+usr/lib/libkdeinit4_calligraplanwork.so
33 usr/lib/libkplatokernel.so.11.0.0
34 usr/lib/libkplatomodels.so.11
35 usr/lib/libkplatomodels.so.11.0.0
36
37=== modified file 'debian/calligrasheets.install'
38--- debian/calligrasheets.install 2013-02-19 15:16:29 +0000
39+++ debian/calligrasheets.install 2013-02-21 10:52:20 +0000
40@@ -29,6 +29,7 @@
41 usr/lib/kde4/qproimport.so
42 usr/lib/kde4/spreadsheetshape-deferred.so
43 usr/lib/kde4/spreadsheetshape.so
44+usr/lib/libkdeinit4_calligrasheets.so
45 usr/lib/kde4/xlsximport.so
46 usr/lib/libcalligrasheetscommon.so.11
47 usr/lib/libcalligrasheetscommon.so.11.0.0
48
49=== modified file 'debian/calligrastage.install'
50--- debian/calligrastage.install 2013-02-19 15:16:29 +0000
51+++ debian/calligrastage.install 2013-02-21 10:52:20 +0000
52@@ -14,6 +14,7 @@
53 usr/lib/kde4/kpr_pageeffect_swapeffect.so
54 usr/lib/kde4/kpr_shapeanimation_example.so
55 usr/lib/kde4/kprvariables.so
56+usr/lib/libkdeinit4_calligrastage.so
57 usr/lib/kde4/powerpointimport.so
58 usr/lib/kde4/pptximport.so
59 usr/lib/libcalligrastageprivate.so.11
60
61=== modified file 'debian/calligrawords-common.install'
62--- debian/calligrawords-common.install 2013-02-19 22:47:41 +0000
63+++ debian/calligrawords-common.install 2013-02-21 10:52:20 +0000
64@@ -7,6 +7,7 @@
65 usr/lib/kde4/mswordodf_import.so
66 usr/lib/kde4/rtfimport.so
67 usr/lib/kde4/wpdimport.so
68+usr/lib/libkdeinit4_calligrawords.so
69 usr/lib/kde4/wpsimport.so
70 usr/lib/libRtfReader.so.11
71 usr/lib/libRtfReader.so.11.0.0
72
73=== modified file 'debian/changelog'
74--- debian/changelog 2013-02-20 15:18:28 +0000
75+++ debian/changelog 2013-02-21 10:52:20 +0000
76@@ -1,3 +1,11 @@
77+calligra (1:2.6.1-0ubuntu5) raring; urgency=low
78+
79+ * Added the libkdeinit4_*.so files to get applications executable
80+ * Updated the libkdeinit4_*.so files description
81+ from debian/not-installed so to remind people not to remove it.
82+
83+ -- Howard Chan <smartboyhw@gmail.com> Thu, 21 Feb 2013 18:27:43 +0800
84+
85 calligra (1:2.6.1-0ubuntu4) raring; urgency=low
86
87 * Remove libkdgantt.so.11 and libkdgantt.so.11.0.0 from
88
89=== modified file 'debian/karbon.install'
90--- debian/karbon.install 2013-02-19 15:16:29 +0000
91+++ debian/karbon.install 2013-02-21 10:52:20 +0000
92@@ -16,6 +16,7 @@
93 usr/lib/kde4/wmfexport.so
94 usr/lib/kde4/wmfimport.so
95 usr/lib/kde4/wpgimport.so
96+usr/lib/libkdeinit4_karbon.so
97 usr/lib/libkarboncommon.so.11
98 usr/lib/libkarboncommon.so.11.0.0
99 usr/lib/libkarbonui.so.11
100
101=== modified file 'debian/krita.install'
102--- debian/krita.install 2013-02-19 15:16:29 +0000
103+++ debian/krita.install 2013-02-21 10:52:20 +0000
104@@ -215,6 +215,7 @@
105 usr/lib/kde4/kritashivagenerators.so
106 usr/lib/kde4/kritaexrimport.so
107 usr/lib/kde4/kritajp2import.so
108+usr/lib/libkdeinit4_krita.so
109 usr/lib/kde4/kritashivafilters.so
110 usr/lib/kde4/kritaexrexport.so
111 usr/share/applications/kde4/krita_exr.desktop
112
113=== modified file 'debian/not-installed'
114--- debian/not-installed 2012-10-30 23:27:40 +0000
115+++ debian/not-installed 2013-02-21 10:52:20 +0000
116@@ -17,7 +17,7 @@
117 ./usr/bin/cstrunner
118 ./usr/bin/visualimagecompare
119
120-# libkdeinit stuff
121+# libkdeinit stuff (PLEASE DO NOT REMOVE IT FROM .install FILES)
122 ./usr/lib/libkdeinit4_calligraauthor.so
123 ./usr/lib/libkdeinit4_calligraflow.so
124 ./usr/lib/libkdeinit4_calligraplan.so

Subscribers

People subscribed via source and target branches

to all changes: