kubuntu-packaging

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

  1. calligra-2.6.1-new
  2. Merge into 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
=== modified file 'debian/calligra-data.install'
--- debian/calligra-data.install 2013-02-06 17:55:08 +0000
+++ debian/calligra-data.install 2013-02-19 15:21:42 +0000
@@ -307,6 +307,7 @@
307usr/share/kde4/services/pluginshape.desktop307usr/share/kde4/services/pluginshape.desktop
308usr/share/kde4/services/spacenavigator.desktop308usr/share/kde4/services/spacenavigator.desktop
309usr/share/kde4/services/spellcheck.desktop309usr/share/kde4/services/spellcheck.desktop
310usr/share/kde4/services/words_Mobi_export.desktop
310usr/share/kde4/services/textshape.desktop311usr/share/kde4/services/textshape.desktop
311usr/share/kde4/services/textvariables.desktop312usr/share/kde4/services/textvariables.desktop
312usr/share/kde4/services/thesaurustool.desktop313usr/share/kde4/services/thesaurustool.desktop
313314
=== modified file 'debian/calligra-dev.install'
--- debian/calligra-dev.install 2012-11-27 08:34:46 +0000
+++ debian/calligra-dev.install 2013-02-19 15:21:42 +0000
@@ -39,6 +39,7 @@
39usr/lib/libkritalibbrush.so39usr/lib/libkritalibbrush.so
40usr/lib/libkritalibpaintop.so40usr/lib/libkritalibpaintop.so
41usr/lib/libkritaui.so41usr/lib/libkritaui.so
42usr/lib/libkdgantt.so
42usr/lib/libkundo2.so43usr/lib/libkundo2.so
43usr/lib/libmsooxml.so44usr/lib/libmsooxml.so
44usr/lib/libpigmentcms.so45usr/lib/libpigmentcms.so
4546
=== modified file 'debian/calligra-libs.install'
--- debian/calligra-libs.install 2012-11-27 08:34:46 +0000
+++ debian/calligra-libs.install 2013-02-19 15:21:42 +0000
@@ -9,6 +9,7 @@
9usr/lib/kde4/changecase.so9usr/lib/kde4/changecase.so
10usr/lib/kde4/chartshape.so10usr/lib/kde4/chartshape.so
11usr/lib/kde4/defaulttools.so11usr/lib/kde4/defaulttools.so
12usr/lib/kde4/exportMobi.so
12usr/lib/kde4/formulashape.so13usr/lib/kde4/formulashape.so
13usr/lib/kde4/kodocinfopropspage.so14usr/lib/kde4/kodocinfopropspage.so
14usr/lib/kde4/kolcmsengine.so15usr/lib/kde4/kolcmsengine.so
@@ -47,6 +48,10 @@
47usr/lib/libkopageapp.so.11.0.048usr/lib/libkopageapp.so.11.0.0
48usr/lib/libkoplugin.so.1149usr/lib/libkoplugin.so.11
49usr/lib/libkoplugin.so.11.0.050usr/lib/libkoplugin.so.11.0.0
51usr/lib/libkdgantt.so.11
52usr/lib/libkdgantt.so.11.0.0
53usr/lib/librcps_plan.so.11
54usr/lib/librcps_plan.so.11.0.0
50usr/lib/libkoproperty.so.1155usr/lib/libkoproperty.so.11
51usr/lib/libkoproperty.so.11.0.056usr/lib/libkoproperty.so.11.0.0
52usr/lib/libkoreport.so.1157usr/lib/libkoreport.so.11
5358
=== modified file 'debian/calligraauthor.install'
--- debian/calligraauthor.install 2012-10-30 23:27:40 +0000
+++ debian/calligraauthor.install 2013-02-19 15:21:42 +0000
@@ -1,6 +1,5 @@
1usr/bin/calligraauthor1usr/bin/calligraauthor
2usr/lib/kde4/authorpart.so2usr/lib/kde4/authorpart.so
3usr/lib/libkdeinit4_calligraauthor.so
4usr/share/applications/kde4/author.desktop3usr/share/applications/kde4/author.desktop
5usr/share/kde4/apps/author/author.rc4usr/share/kde4/apps/author/author.rc
6usr/share/kde4/apps/author/author_readonly.rc5usr/share/kde4/apps/author/author_readonly.rc
76
=== modified file 'debian/calligraflow.install'
--- debian/calligraflow.install 2012-10-30 23:27:40 +0000
+++ debian/calligraflow.install 2013-02-19 15:21:42 +0000
@@ -3,7 +3,6 @@
3usr/lib/kde4/flowpart.so3usr/lib/kde4/flowpart.so
4usr/lib/libflowprivate.so.114usr/lib/libflowprivate.so.11
5usr/lib/libflowprivate.so.11.0.05usr/lib/libflowprivate.so.11.0.0
6usr/lib/libkdeinit4_calligraflow.so
7usr/share/applications/kde4/flow.desktop6usr/share/applications/kde4/flow.desktop
8usr/share/kde4/services/ServiceMenus/flow_print.desktop7usr/share/kde4/services/ServiceMenus/flow_print.desktop
9usr/share/kde4/services/flowdockersplugin.desktop8usr/share/kde4/services/flowdockersplugin.desktop
109
=== modified file 'debian/calligraplan.install'
--- debian/calligraplan.install 2013-02-06 17:55:08 +0000
+++ debian/calligraplan.install 2013-02-19 15:21:42 +0000
@@ -7,8 +7,6 @@
7usr/lib/kde4/planpart.so7usr/lib/kde4/planpart.so
8usr/lib/kde4/plantjscheduler.so8usr/lib/kde4/plantjscheduler.so
9usr/lib/kde4/planworkpart.so9usr/lib/kde4/planworkpart.so
10usr/lib/libkdeinit4_calligraplan.so
11usr/lib/libkdeinit4_calligraplanwork.so
12usr/lib/libkplatokernel.so.1110usr/lib/libkplatokernel.so.11
13usr/lib/libkplatokernel.so.11.0.011usr/lib/libkplatokernel.so.11.0.0
14usr/lib/libkplatomodels.so.1112usr/lib/libkplatomodels.so.11
1513
=== modified file 'debian/calligrasheets.install'
--- debian/calligrasheets.install 2013-02-06 17:55:08 +0000
+++ debian/calligrasheets.install 2013-02-19 15:21:42 +0000
@@ -34,7 +34,6 @@
34usr/lib/libcalligrasheetscommon.so.11.0.034usr/lib/libcalligrasheetscommon.so.11.0.0
35usr/lib/libcalligrasheetsodf.so.1135usr/lib/libcalligrasheetsodf.so.11
36usr/lib/libcalligrasheetsodf.so.11.0.036usr/lib/libcalligrasheetsodf.so.11.0.0
37usr/lib/libkdeinit4_calligrasheets.so
38usr/share/applications/kde4/sheets.desktop37usr/share/applications/kde4/sheets.desktop
39usr/share/doc/kde/HTML/en/sheets38usr/share/doc/kde/HTML/en/sheets
40usr/share/kde4/apps/sheets/39usr/share/kde4/apps/sheets/
4140
=== modified file 'debian/calligrastage.install'
--- debian/calligrastage.install 2013-02-06 17:55:08 +0000
+++ debian/calligrastage.install 2013-02-19 15:21:42 +0000
@@ -18,7 +18,6 @@
18usr/lib/kde4/pptximport.so18usr/lib/kde4/pptximport.so
19usr/lib/libcalligrastageprivate.so.1119usr/lib/libcalligrastageprivate.so.11
20usr/lib/libcalligrastageprivate.so.11.0.020usr/lib/libcalligrastageprivate.so.11.0.0
21usr/lib/libkdeinit4_calligrastage.so
22usr/share/applications/kde4/stage.desktop21usr/share/applications/kde4/stage.desktop
23usr/share/doc/kde/HTML/en/stage22usr/share/doc/kde/HTML/en/stage
24usr/share/icons/hicolor/16x16/actions/black.png23usr/share/icons/hicolor/16x16/actions/black.png
@@ -51,7 +50,6 @@
51usr/share/kde4/services/stagepart.desktop50usr/share/kde4/services/stagepart.desktop
52usr/share/kde4/servicetypes/kpr_pageeffect.desktop51usr/share/kde4/servicetypes/kpr_pageeffect.desktop
53usr/share/kde4/servicetypes/kpr_shapeanimation.desktop52usr/share/kde4/servicetypes/kpr_shapeanimation.desktop
54
55usr/share/kde4/services/stage_kpr_thumbnail.desktop53usr/share/kde4/services/stage_kpr_thumbnail.desktop
56usr/share/kde4/services/stage_odp_thumbnail.desktop54usr/share/kde4/services/stage_odp_thumbnail.desktop
57usr/share/kde4/services/stage_powerpoint_thumbnail.desktop55usr/share/kde4/services/stage_powerpoint_thumbnail.desktop
5856
=== modified file 'debian/calligrawords.install'
--- debian/calligrawords.install 2012-10-30 23:27:40 +0000
+++ debian/calligrawords.install 2013-02-19 15:21:42 +0000
@@ -1,6 +1,6 @@
1usr/bin/calligrawords1usr/bin/calligrawords
2usr/lib/kde4/wordspart.so2usr/lib/kde4/wordspart.so
3usr/lib/libkdeinit4_calligrawords.so
4usr/share/applications/kde4/words.desktop3usr/share/applications/kde4/words.desktop
5usr/share/kde4/services/ServiceMenus/words_print.desktop4usr/share/kde4/services/ServiceMenus/words_print.desktop
6usr/share/kde4/services/wordspart.desktop5usr/share/kde4/services/wordspart.desktop
6
77
=== modified file 'debian/changelog'
--- debian/changelog 2013-02-06 17:55:08 +0000
+++ debian/changelog 2013-02-19 15:21:42 +0000
@@ -1,3 +1,11 @@
1calligra (1:2.6.1-0ubuntu1) raring; urgency=low
2
3 * New upstream release.
4 * Refreshed the patches so they are without offsets
5 * Fixed multiple .install files to make installation work.
6
7 -- Howard Chan <smartboyhw@gmail.com> Mon, 18 Feb 2013 19:09:22 +0800
8
1calligra (1:2.6.0-0ubuntu1) raring; urgency=low9calligra (1:2.6.0-0ubuntu1) raring; urgency=low
210
3 * New upstream release.11 * New upstream release.
412
=== modified file 'debian/karbon.install'
--- debian/karbon.install 2013-02-06 17:55:08 +0000
+++ debian/karbon.install 2013-02-19 15:21:42 +0000
@@ -20,7 +20,6 @@
20usr/lib/libkarboncommon.so.11.0.020usr/lib/libkarboncommon.so.11.0.0
21usr/lib/libkarbonui.so.1121usr/lib/libkarbonui.so.11
22usr/lib/libkarbonui.so.11.0.022usr/lib/libkarbonui.so.11.0.0
23usr/lib/libkdeinit4_karbon.so
24usr/share/applications/kde4/karbon.desktop23usr/share/applications/kde4/karbon.desktop
25usr/share/icons/hicolor/16x16/apps/calligrakarbon.png24usr/share/icons/hicolor/16x16/apps/calligrakarbon.png
26usr/share/icons/hicolor/22x22/apps/calligrakarbon.png25usr/share/icons/hicolor/22x22/apps/calligrakarbon.png
2726
=== modified file 'debian/krita-data.install'
--- debian/krita-data.install 2013-02-06 17:55:08 +0000
+++ debian/krita-data.install 2013-02-19 15:21:42 +0000
@@ -25,3 +25,27 @@
25usr/share/kde4/apps/calligra/icons/oxygen/22x22/actions/edit-table-cell-split.png25usr/share/kde4/apps/calligra/icons/oxygen/22x22/actions/edit-table-cell-split.png
26usr/share/kde4/apps/calligra/icons/oxygen/22x22/actions/zoom-draw.png26usr/share/kde4/apps/calligra/icons/oxygen/22x22/actions/zoom-draw.png
27usr/share/kde4/apps/calligra/icons/hicolor/32x32/actions/tool_imageeffects.png27usr/share/kde4/apps/calligra/icons/hicolor/32x32/actions/tool_imageeffects.png
28usr/share/kde4/apps/calligra/palettes/Nature_stones.gpl
29usr/share/kde4/apps/calligra/palettes/photoshop-swatches-sketchlings-swatches.aco.gpl
30usr/share/kde4/apps/calligra/palettes/1-classic-kit.gpl
31usr/share/kde4/apps/calligra/palettes/1-All-Color-for-good-colors-choice.gpl
32usr/share/kde4/apps/calligra/palettes/Nature_Grass.gpl
33usr/share/kde4/apps/calligra/palettes/Fabric_jeans.gpl
34usr/share/kde4/apps/calligra/palettes/Human_Skin.gpl
35usr/share/kde4/apps/calligra/palettes/Nature_wood.gpl
36usr/share/kde4/apps/calligra/palettes/Paletilla.gpl
37usr/share/kde4/apps/calligra/palettes/Untitled.gpl
38usr/share/kde4/apps/calligra/palettes/Fabric_colored.gpl
39usr/share/kde4/apps/calligra/palettes/bugslife_final.png-10.gpl
40usr/share/kde4/apps/calligra/palettes/Skin.gpl.txt.gpl
41usr/share/kde4/apps/calligra/palettes/Human_Hair.gpl
42usr/share/kde4/apps/calligra/palettes/testgimp_swatches.aco.gpl
43usr/share/kde4/apps/calligra/palettes/color_wheel-2-rgb.aco.gpl
44usr/share/kde4/apps/calligra/palettes/NESPAL.gpl.gpl
45usr/share/kde4/apps/calligra/palettes/Nature_flowers.gpl
46usr/share/kde4/apps/calligra/palettes/Nature_Water_Sky.gpl
47usr/share/kde4/apps/calligra/palettes/Human_eyes.gpl
48usr/share/kde4/apps/calligra/palettes/Named_Colors.gpl
49usr/share/kde4/apps/calligra/palettes/mi-paleta-2009.aco.gpl
50usr/share/kde4/apps/calligra/palettes/Human_lips.gpl
51usr/share/kde4/apps/calligra/palettes/new_kde.gpl
2852
=== modified file 'debian/krita.install'
--- debian/krita.install 2013-02-06 17:55:08 +0000
+++ debian/krita.install 2013-02-19 15:21:42 +0000
@@ -91,7 +91,6 @@
91usr/lib/kde4/kritaunsharpfilter.so91usr/lib/kde4/kritaunsharpfilter.so
92usr/lib/kde4/kritawavefilter.so92usr/lib/kde4/kritawavefilter.so
93usr/lib/kde4/kritaxcfimport.so93usr/lib/kde4/kritaxcfimport.so
94usr/lib/libkdeinit4_krita.so
95usr/lib/libkritaimage.so.1194usr/lib/libkritaimage.so.11
96usr/lib/libkritaimage.so.11.0.095usr/lib/libkritaimage.so.11.0.0
97usr/lib/libkritalibbrush.so.1196usr/lib/libkritalibbrush.so.11
@@ -232,3 +231,4 @@
232usr/share/icons/hicolor/1024x1024/apps/calligrakrita.png231usr/share/icons/hicolor/1024x1024/apps/calligrakrita.png
233usr/lib/kde4/kritapsdexport.so232usr/lib/kde4/kritapsdexport.so
234usr/share/kde4/services/krita_psd_export.desktop233usr/share/kde4/services/krita_psd_export.desktop
234usr/share/icons/hicolor/scalable/apps/calligrakrita.svgz
235235
=== modified file 'debian/patches/kubuntu_build_calligraactive.diff'
--- debian/patches/kubuntu_build_calligraactive.diff 2013-02-06 17:55:08 +0000
+++ debian/patches/kubuntu_build_calligraactive.diff 2013-02-19 15:21:42 +0000
@@ -4,8 +4,8 @@
4Author: Philip Muškovac <yofel@kubuntu.org>4Author: Philip Muškovac <yofel@kubuntu.org>
5Index: calligra/CMakeLists.txt5Index: calligra/CMakeLists.txt
6===================================================================6===================================================================
7--- calligra.orig/CMakeLists.txt 2013-02-06 22:26:15.701677266 +08007--- calligra.orig/CMakeLists.txt 2013-02-18 19:11:38.194627132 +0800
8+++ calligra/CMakeLists.txt 2013-02-06 22:26:17.469677240 +08008+++ calligra/CMakeLists.txt 2013-02-18 19:11:38.189627132 +0800
9@@ -93,7 +93,7 @@9@@ -93,7 +93,7 @@
10 set(SHOULD_BUILD_CALLIGRA TRUE)10 set(SHOULD_BUILD_CALLIGRA TRUE)
11 set(SHOULD_BUILD_CSTESTER TRUE)11 set(SHOULD_BUILD_CSTESTER TRUE)
1212
=== modified file 'debian/patches/kubuntu_words_mimetype.diff'
--- debian/patches/kubuntu_words_mimetype.diff 2013-02-06 17:55:08 +0000
+++ debian/patches/kubuntu_words_mimetype.diff 2013-02-19 15:21:42 +0000
@@ -4,9 +4,9 @@
4Author: Jonathan Riddell <jriddell@ubuntu.com>4Author: Jonathan Riddell <jriddell@ubuntu.com>
5Index: calligra/words/part/words.desktop5Index: calligra/words/part/words.desktop
6===================================================================6===================================================================
7--- calligra.orig/words/part/words.desktop 2013-02-06 22:26:15.601677268 +08007--- calligra.orig/words/part/words.desktop 2013-02-18 19:11:40.452627098 +0800
8+++ calligra/words/part/words.desktop 2013-02-06 22:26:18.881677219 +08008+++ calligra/words/part/words.desktop 2013-02-18 19:11:40.448627098 +0800
9@@ -112,7 +112,7 @@9@@ -116,7 +116,7 @@
10 Comment[x-test]=xxWrite documentsxx10 Comment[x-test]=xxWrite documentsxx
11 Comment[zh_CN]=编写文档11 Comment[zh_CN]=编写文档
12 Comment[zh_TW]=寫文件12 Comment[zh_TW]=寫文件
1313
=== modified file 'debian/patches/kubuntu_x11_link.patch'
--- debian/patches/kubuntu_x11_link.patch 2013-02-06 17:55:08 +0000
+++ debian/patches/kubuntu_x11_link.patch 2013-02-19 15:21:42 +0000
@@ -3,8 +3,8 @@
3## Bug: bug URL3## Bug: bug URL
4Index: calligra/krita/ui/CMakeLists.txt4Index: calligra/krita/ui/CMakeLists.txt
5===================================================================5===================================================================
6--- calligra.orig/krita/ui/CMakeLists.txt 2013-02-06 22:26:15.449677270 +08006--- calligra.orig/krita/ui/CMakeLists.txt 2013-02-18 19:11:44.729627035 +0800
7+++ calligra/krita/ui/CMakeLists.txt 2013-02-06 22:26:21.061677187 +08007+++ calligra/krita/ui/CMakeLists.txt 2013-02-18 19:11:44.724627035 +0800
8@@ -289,6 +289,7 @@8@@ -289,6 +289,7 @@
9 endif(HAVE_OPENGL)9 endif(HAVE_OPENGL)
10 10

Subscribers

People subscribed via source and target branches

to all changes: