Merge lp:~smartboyhw/kubuntu-packaging/calligra-2.6.1-new into lp:~kubuntu-packagers/kubuntu-packaging/calligra

Proposed by Howard Chan
Status: Merged
Merged at revision: 44
Proposed branch: lp:~smartboyhw/kubuntu-packaging/calligra-2.6.1-new
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/calligra
Diff against target: 249 lines (+48/-17)
16 files modified
debian/calligra-data.install (+1/-0)
debian/calligra-dev.install (+1/-0)
debian/calligra-libs.install (+5/-0)
debian/calligraauthor.install (+0/-1)
debian/calligraflow.install (+0/-1)
debian/calligraplan.install (+0/-2)
debian/calligrasheets.install (+0/-1)
debian/calligrastage.install (+0/-2)
debian/calligrawords.install (+1/-1)
debian/changelog (+8/-0)
debian/karbon.install (+0/-1)
debian/krita-data.install (+24/-0)
debian/krita.install (+1/-1)
debian/patches/kubuntu_build_calligraactive.diff (+2/-2)
debian/patches/kubuntu_words_mimetype.diff (+3/-3)
debian/patches/kubuntu_x11_link.patch (+2/-2)
To merge this branch: bzr merge lp:~smartboyhw/kubuntu-packaging/calligra-2.6.1-new
Reviewer Review Type Date Requested Status
Philip Muškovac merge Pending
Kubuntu Packagers Pending
Review via email: mp+149305@code.launchpad.net

Description of the change

New upstream version 2.6.1 -> Ubuntu version 1:2.6.1-0ubuntu1

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-data.install'
2--- debian/calligra-data.install 2013-02-06 17:55:08 +0000
3+++ debian/calligra-data.install 2013-02-19 15:21:42 +0000
4@@ -307,6 +307,7 @@
5 usr/share/kde4/services/pluginshape.desktop
6 usr/share/kde4/services/spacenavigator.desktop
7 usr/share/kde4/services/spellcheck.desktop
8+usr/share/kde4/services/words_Mobi_export.desktop
9 usr/share/kde4/services/textshape.desktop
10 usr/share/kde4/services/textvariables.desktop
11 usr/share/kde4/services/thesaurustool.desktop
12
13=== modified file 'debian/calligra-dev.install'
14--- debian/calligra-dev.install 2012-11-27 08:34:46 +0000
15+++ debian/calligra-dev.install 2013-02-19 15:21:42 +0000
16@@ -39,6 +39,7 @@
17 usr/lib/libkritalibbrush.so
18 usr/lib/libkritalibpaintop.so
19 usr/lib/libkritaui.so
20+usr/lib/libkdgantt.so
21 usr/lib/libkundo2.so
22 usr/lib/libmsooxml.so
23 usr/lib/libpigmentcms.so
24
25=== modified file 'debian/calligra-libs.install'
26--- debian/calligra-libs.install 2012-11-27 08:34:46 +0000
27+++ debian/calligra-libs.install 2013-02-19 15:21:42 +0000
28@@ -9,6 +9,7 @@
29 usr/lib/kde4/changecase.so
30 usr/lib/kde4/chartshape.so
31 usr/lib/kde4/defaulttools.so
32+usr/lib/kde4/exportMobi.so
33 usr/lib/kde4/formulashape.so
34 usr/lib/kde4/kodocinfopropspage.so
35 usr/lib/kde4/kolcmsengine.so
36@@ -47,6 +48,10 @@
37 usr/lib/libkopageapp.so.11.0.0
38 usr/lib/libkoplugin.so.11
39 usr/lib/libkoplugin.so.11.0.0
40+usr/lib/libkdgantt.so.11
41+usr/lib/libkdgantt.so.11.0.0
42+usr/lib/librcps_plan.so.11
43+usr/lib/librcps_plan.so.11.0.0
44 usr/lib/libkoproperty.so.11
45 usr/lib/libkoproperty.so.11.0.0
46 usr/lib/libkoreport.so.11
47
48=== modified file 'debian/calligraauthor.install'
49--- debian/calligraauthor.install 2012-10-30 23:27:40 +0000
50+++ debian/calligraauthor.install 2013-02-19 15:21:42 +0000
51@@ -1,6 +1,5 @@
52 usr/bin/calligraauthor
53 usr/lib/kde4/authorpart.so
54-usr/lib/libkdeinit4_calligraauthor.so
55 usr/share/applications/kde4/author.desktop
56 usr/share/kde4/apps/author/author.rc
57 usr/share/kde4/apps/author/author_readonly.rc
58
59=== modified file 'debian/calligraflow.install'
60--- debian/calligraflow.install 2012-10-30 23:27:40 +0000
61+++ debian/calligraflow.install 2013-02-19 15:21:42 +0000
62@@ -3,7 +3,6 @@
63 usr/lib/kde4/flowpart.so
64 usr/lib/libflowprivate.so.11
65 usr/lib/libflowprivate.so.11.0.0
66-usr/lib/libkdeinit4_calligraflow.so
67 usr/share/applications/kde4/flow.desktop
68 usr/share/kde4/services/ServiceMenus/flow_print.desktop
69 usr/share/kde4/services/flowdockersplugin.desktop
70
71=== modified file 'debian/calligraplan.install'
72--- debian/calligraplan.install 2013-02-06 17:55:08 +0000
73+++ debian/calligraplan.install 2013-02-19 15:21:42 +0000
74@@ -7,8 +7,6 @@
75 usr/lib/kde4/planpart.so
76 usr/lib/kde4/plantjscheduler.so
77 usr/lib/kde4/planworkpart.so
78-usr/lib/libkdeinit4_calligraplan.so
79-usr/lib/libkdeinit4_calligraplanwork.so
80 usr/lib/libkplatokernel.so.11
81 usr/lib/libkplatokernel.so.11.0.0
82 usr/lib/libkplatomodels.so.11
83
84=== modified file 'debian/calligrasheets.install'
85--- debian/calligrasheets.install 2013-02-06 17:55:08 +0000
86+++ debian/calligrasheets.install 2013-02-19 15:21:42 +0000
87@@ -34,7 +34,6 @@
88 usr/lib/libcalligrasheetscommon.so.11.0.0
89 usr/lib/libcalligrasheetsodf.so.11
90 usr/lib/libcalligrasheetsodf.so.11.0.0
91-usr/lib/libkdeinit4_calligrasheets.so
92 usr/share/applications/kde4/sheets.desktop
93 usr/share/doc/kde/HTML/en/sheets
94 usr/share/kde4/apps/sheets/
95
96=== modified file 'debian/calligrastage.install'
97--- debian/calligrastage.install 2013-02-06 17:55:08 +0000
98+++ debian/calligrastage.install 2013-02-19 15:21:42 +0000
99@@ -18,7 +18,6 @@
100 usr/lib/kde4/pptximport.so
101 usr/lib/libcalligrastageprivate.so.11
102 usr/lib/libcalligrastageprivate.so.11.0.0
103-usr/lib/libkdeinit4_calligrastage.so
104 usr/share/applications/kde4/stage.desktop
105 usr/share/doc/kde/HTML/en/stage
106 usr/share/icons/hicolor/16x16/actions/black.png
107@@ -51,7 +50,6 @@
108 usr/share/kde4/services/stagepart.desktop
109 usr/share/kde4/servicetypes/kpr_pageeffect.desktop
110 usr/share/kde4/servicetypes/kpr_shapeanimation.desktop
111-
112 usr/share/kde4/services/stage_kpr_thumbnail.desktop
113 usr/share/kde4/services/stage_odp_thumbnail.desktop
114 usr/share/kde4/services/stage_powerpoint_thumbnail.desktop
115
116=== modified file 'debian/calligrawords.install'
117--- debian/calligrawords.install 2012-10-30 23:27:40 +0000
118+++ debian/calligrawords.install 2013-02-19 15:21:42 +0000
119@@ -1,6 +1,6 @@
120 usr/bin/calligrawords
121 usr/lib/kde4/wordspart.so
122-usr/lib/libkdeinit4_calligrawords.so
123 usr/share/applications/kde4/words.desktop
124 usr/share/kde4/services/ServiceMenus/words_print.desktop
125 usr/share/kde4/services/wordspart.desktop
126+
127
128=== modified file 'debian/changelog'
129--- debian/changelog 2013-02-06 17:55:08 +0000
130+++ debian/changelog 2013-02-19 15:21:42 +0000
131@@ -1,3 +1,11 @@
132+calligra (1:2.6.1-0ubuntu1) raring; urgency=low
133+
134+ * New upstream release.
135+ * Refreshed the patches so they are without offsets
136+ * Fixed multiple .install files to make installation work.
137+
138+ -- Howard Chan <smartboyhw@gmail.com> Mon, 18 Feb 2013 19:09:22 +0800
139+
140 calligra (1:2.6.0-0ubuntu1) raring; urgency=low
141
142 * New upstream release.
143
144=== modified file 'debian/karbon.install'
145--- debian/karbon.install 2013-02-06 17:55:08 +0000
146+++ debian/karbon.install 2013-02-19 15:21:42 +0000
147@@ -20,7 +20,6 @@
148 usr/lib/libkarboncommon.so.11.0.0
149 usr/lib/libkarbonui.so.11
150 usr/lib/libkarbonui.so.11.0.0
151-usr/lib/libkdeinit4_karbon.so
152 usr/share/applications/kde4/karbon.desktop
153 usr/share/icons/hicolor/16x16/apps/calligrakarbon.png
154 usr/share/icons/hicolor/22x22/apps/calligrakarbon.png
155
156=== modified file 'debian/krita-data.install'
157--- debian/krita-data.install 2013-02-06 17:55:08 +0000
158+++ debian/krita-data.install 2013-02-19 15:21:42 +0000
159@@ -25,3 +25,27 @@
160 usr/share/kde4/apps/calligra/icons/oxygen/22x22/actions/edit-table-cell-split.png
161 usr/share/kde4/apps/calligra/icons/oxygen/22x22/actions/zoom-draw.png
162 usr/share/kde4/apps/calligra/icons/hicolor/32x32/actions/tool_imageeffects.png
163+usr/share/kde4/apps/calligra/palettes/Nature_stones.gpl
164+usr/share/kde4/apps/calligra/palettes/photoshop-swatches-sketchlings-swatches.aco.gpl
165+usr/share/kde4/apps/calligra/palettes/1-classic-kit.gpl
166+usr/share/kde4/apps/calligra/palettes/1-All-Color-for-good-colors-choice.gpl
167+usr/share/kde4/apps/calligra/palettes/Nature_Grass.gpl
168+usr/share/kde4/apps/calligra/palettes/Fabric_jeans.gpl
169+usr/share/kde4/apps/calligra/palettes/Human_Skin.gpl
170+usr/share/kde4/apps/calligra/palettes/Nature_wood.gpl
171+usr/share/kde4/apps/calligra/palettes/Paletilla.gpl
172+usr/share/kde4/apps/calligra/palettes/Untitled.gpl
173+usr/share/kde4/apps/calligra/palettes/Fabric_colored.gpl
174+usr/share/kde4/apps/calligra/palettes/bugslife_final.png-10.gpl
175+usr/share/kde4/apps/calligra/palettes/Skin.gpl.txt.gpl
176+usr/share/kde4/apps/calligra/palettes/Human_Hair.gpl
177+usr/share/kde4/apps/calligra/palettes/testgimp_swatches.aco.gpl
178+usr/share/kde4/apps/calligra/palettes/color_wheel-2-rgb.aco.gpl
179+usr/share/kde4/apps/calligra/palettes/NESPAL.gpl.gpl
180+usr/share/kde4/apps/calligra/palettes/Nature_flowers.gpl
181+usr/share/kde4/apps/calligra/palettes/Nature_Water_Sky.gpl
182+usr/share/kde4/apps/calligra/palettes/Human_eyes.gpl
183+usr/share/kde4/apps/calligra/palettes/Named_Colors.gpl
184+usr/share/kde4/apps/calligra/palettes/mi-paleta-2009.aco.gpl
185+usr/share/kde4/apps/calligra/palettes/Human_lips.gpl
186+usr/share/kde4/apps/calligra/palettes/new_kde.gpl
187
188=== modified file 'debian/krita.install'
189--- debian/krita.install 2013-02-06 17:55:08 +0000
190+++ debian/krita.install 2013-02-19 15:21:42 +0000
191@@ -91,7 +91,6 @@
192 usr/lib/kde4/kritaunsharpfilter.so
193 usr/lib/kde4/kritawavefilter.so
194 usr/lib/kde4/kritaxcfimport.so
195-usr/lib/libkdeinit4_krita.so
196 usr/lib/libkritaimage.so.11
197 usr/lib/libkritaimage.so.11.0.0
198 usr/lib/libkritalibbrush.so.11
199@@ -232,3 +231,4 @@
200 usr/share/icons/hicolor/1024x1024/apps/calligrakrita.png
201 usr/lib/kde4/kritapsdexport.so
202 usr/share/kde4/services/krita_psd_export.desktop
203+usr/share/icons/hicolor/scalable/apps/calligrakrita.svgz
204
205=== modified file 'debian/patches/kubuntu_build_calligraactive.diff'
206--- debian/patches/kubuntu_build_calligraactive.diff 2013-02-06 17:55:08 +0000
207+++ debian/patches/kubuntu_build_calligraactive.diff 2013-02-19 15:21:42 +0000
208@@ -4,8 +4,8 @@
209 Author: Philip Muškovac <yofel@kubuntu.org>
210 Index: calligra/CMakeLists.txt
211 ===================================================================
212---- calligra.orig/CMakeLists.txt 2013-02-06 22:26:15.701677266 +0800
213-+++ calligra/CMakeLists.txt 2013-02-06 22:26:17.469677240 +0800
214+--- calligra.orig/CMakeLists.txt 2013-02-18 19:11:38.194627132 +0800
215++++ calligra/CMakeLists.txt 2013-02-18 19:11:38.189627132 +0800
216 @@ -93,7 +93,7 @@
217 set(SHOULD_BUILD_CALLIGRA TRUE)
218 set(SHOULD_BUILD_CSTESTER TRUE)
219
220=== modified file 'debian/patches/kubuntu_words_mimetype.diff'
221--- debian/patches/kubuntu_words_mimetype.diff 2013-02-06 17:55:08 +0000
222+++ debian/patches/kubuntu_words_mimetype.diff 2013-02-19 15:21:42 +0000
223@@ -4,9 +4,9 @@
224 Author: Jonathan Riddell <jriddell@ubuntu.com>
225 Index: calligra/words/part/words.desktop
226 ===================================================================
227---- calligra.orig/words/part/words.desktop 2013-02-06 22:26:15.601677268 +0800
228-+++ calligra/words/part/words.desktop 2013-02-06 22:26:18.881677219 +0800
229-@@ -112,7 +112,7 @@
230+--- calligra.orig/words/part/words.desktop 2013-02-18 19:11:40.452627098 +0800
231++++ calligra/words/part/words.desktop 2013-02-18 19:11:40.448627098 +0800
232+@@ -116,7 +116,7 @@
233 Comment[x-test]=xxWrite documentsxx
234 Comment[zh_CN]=编写文档
235 Comment[zh_TW]=寫文件
236
237=== modified file 'debian/patches/kubuntu_x11_link.patch'
238--- debian/patches/kubuntu_x11_link.patch 2013-02-06 17:55:08 +0000
239+++ debian/patches/kubuntu_x11_link.patch 2013-02-19 15:21:42 +0000
240@@ -3,8 +3,8 @@
241 ## Bug: bug URL
242 Index: calligra/krita/ui/CMakeLists.txt
243 ===================================================================
244---- calligra.orig/krita/ui/CMakeLists.txt 2013-02-06 22:26:15.449677270 +0800
245-+++ calligra/krita/ui/CMakeLists.txt 2013-02-06 22:26:21.061677187 +0800
246+--- calligra.orig/krita/ui/CMakeLists.txt 2013-02-18 19:11:44.729627035 +0800
247++++ calligra/krita/ui/CMakeLists.txt 2013-02-18 19:11:44.724627035 +0800
248 @@ -289,6 +289,7 @@
249 endif(HAVE_OPENGL)
250

Subscribers

People subscribed via source and target branches

to all changes: