From a92df8bf80b294e23b5e78bcf35278b057301a8b Mon Sep 17 00:00:00 2001 From: namso-01 Date: Wed, 29 Jul 2015 13:02:31 +0300 Subject: [PATCH 1/3] calligra: edit --- extra/office/calligra/calligra/actions.py | 3 + extra/office/calligra/calligra/pspec.xml | 90 +++++++++++------------ 2 files changed, 48 insertions(+), 45 deletions(-) diff --git a/extra/office/calligra/calligra/actions.py b/extra/office/calligra/calligra/actions.py index 9c36c6c897..84223ddbe7 100644 --- a/extra/office/calligra/calligra/actions.py +++ b/extra/office/calligra/calligra/actions.py @@ -36,6 +36,9 @@ def install(): pisitools.dopixmaps("karbon/pics/app/hi32-app-calligrakarbon.png") pisitools.rename("/usr/share/pixmaps/hi32-app-calligrakarbon.png", "calligra-karbon.png") + pisitools.dopixmaps("krita/pics/app/hi32-app-calligrakrita.png") + pisitools.rename("/usr/share/pixmaps/hi32-app-calligrakrita.png", "calligra-krita.png") + pisitools.dopixmaps("kexi/pics/app/hi32-app-calligrakexi.png") pisitools.rename("/usr/share/pixmaps/hi32-app-calligrakexi.png", "calligra-kexi.png") diff --git a/extra/office/calligra/calligra/pspec.xml b/extra/office/calligra/calligra/pspec.xml index bb161bc446..e281dd48b7 100644 --- a/extra/office/calligra/calligra/pspec.xml +++ b/extra/office/calligra/calligra/pspec.xml @@ -93,11 +93,11 @@ /usr/bin/braindump /usr/share/kde4/apps/braindump/ - /usr/lib/libbraindumpcore.so.1* - /usr/lib/kde4/braindump_shape_web.so - /usr/lib/kde4/braindump_shape_state.so + /usr/lib/libbraindumpcore.so.1* /usr/share/kde4/apps/stateshape/states/ + /usr/lib/kde4/braindump_shape_web.so /usr/share/appdata/braindump.appdata.xml + /usr/lib/kde4/braindump_shape_state.so /usr/share/pixmaps/calligra-braindump.png /usr/share/icons/hicolor/*/apps/braindump.png /usr/share/applications/kde4/braindump.desktop @@ -203,11 +203,11 @@ calligra-karbon - /usr/lib/libkowv2.s* - /usr/lib/libkoodf2.s* - /usr/lib/libRtfReader.s* - /usr/lib/libkomsooxml.s* - /usr/lib/libkoodfreader.s* + /usr/lib/libkowv2.so* + /usr/lib/libkoodf2.so* + /usr/lib/libRtfReader.so* + /usr/lib/libkomsooxml.so* + /usr/lib/libkoodfreader.so* /usr/lib/kde4/calligra_filter_*.so /usr/share/mime/packages/wiki-format.xml /usr/share/mime/packages/msooxml-all.xml @@ -261,7 +261,7 @@ /usr/share/kde4/apps/flow /usr/bin/calligraflow /usr/share/kde4/config/flowrc - /usr/lib/libflowprivate.s* + /usr/lib/libflowprivate.so* /usr/share/appdata/flow.appdata.xml /usr/share/pixmaps/calligra-flow.png /usr/lib/libkdeinit4_calligraflow.so @@ -309,7 +309,7 @@ Create scalable vector drawings /usr/bin/karbon - /usr/lib/libkarbon*.s* + /usr/lib/libkarbon*.so* /usr/lib/kde4/karbon*.so /usr/share/kde4/apps/karbon/ /usr/share/kde4/config/karbonrc @@ -349,7 +349,7 @@ /usr/bin/kex* - /usr/lib/libkexi*.s* + /usr/lib/libkexi*.so* /usr/lib/kde4/kexi*.so /usr/share/kde4/apps/kexi/ /usr/share/kde4/config/kexirc @@ -398,8 +398,8 @@ /usr/lib/kde4/krita* /usr/share/calligraactive /usr/bin/gmicparser - /usr/lib/liblibglobal.s* - /usr/lib/liblibkispsd.s* + /usr/lib/liblibglobal.so* + /usr/lib/liblibkispsd.so* /usr/share/kde4/apps/krita/ /usr/share/color/icc/krita/ /usr/bin/calligraactive @@ -446,31 +446,31 @@ /usr/share/doc/ - /usr/lib/libflake.s* - /usr/lib/libkoodf.s* - /usr/lib/libkomain.s* - /usr/lib/libkotext.s* - /usr/lib/libkundo2.s* - /usr/lib/libkokross.s* - /usr/lib/libkoplugin.s* - /usr/lib/libkoreport.s* - /usr/lib/libkopageapp.s* - /usr/lib/libkoversion.s* - /usr/lib/libkowidgets.s* - /usr/lib/libpigmentcms.s* - /usr/lib/libcalligradb.s* - /usr/lib/libkoproperty.s* - /usr/lib/libbasicflakes.s* - /usr/lib/libkotextlayout.s* - /usr/lib/libkowidgetutils.s* - /usr/lib/libkovectorimage.s* - /usr/lib/kde4/kopabackgroundtool.so - /usr/lib/kde4/kexidb_sqlite3_icu.so - /usr/lib/kde4/kexidb_sqlite3driver.so + /usr/lib/libflake.so* + /usr/lib/libkoodf.so* + /usr/lib/libkomain.so* + /usr/lib/libkotext.so* + /usr/lib/libkundo2.so* + /usr/lib/libkokross.so* + /usr/lib/libkoplugin.so* + /usr/lib/libkoreport.so* + /usr/lib/libkopageapp.so* + /usr/lib/libkoversion.so* + /usr/lib/libkowidgets.so* + /usr/lib/libpigmentcms.so* + /usr/lib/libcalligradb.so* + /usr/lib/libkoproperty.so* + /usr/lib/libbasicflakes.so* + /usr/lib/libkotextlayout.so* + /usr/lib/libkowidgetutils.so* + /usr/lib/libkovectorimage.so* + /usr/lib/kde4/kopabackgroundtool.so + /usr/lib/kde4/kexidb_sqlite3_icu.so + /usr/lib/kde4/kexidb_sqlite3driver.so /usr/share/kde4/servicetypes/flake.desktop - /usr/lib/kde4/calligra_tool_basicflakes.so /usr/share/icons/oxygen/*/actions/table.png /usr/share/kde4/servicetypes/pigment.desktop + /usr/lib/kde4/calligra_tool_basicflakes.so /usr/share/kde4/apps/calligra/icons/zoom_*.png /usr/share/kde4/servicetypes/flaketool.desktop /usr/share/kde4/servicetypes/kopa_tool.desktop @@ -566,16 +566,16 @@ calligra-plugins - /usr/lib/libplan*.s* + /usr/lib/libplan*.so* /usr/lib/kde4/plan*.so - /usr/lib/libkplatoui.s* + /usr/lib/libkplatoui.so* /usr/share/kde4/apps/plan/ /usr/bin/calligrapla* /usr/lib/librcps_plan.so* /usr/share/kde4/config/planrc - /usr/lib/libkplatokernel.s* - /usr/lib/libkplatomodels.s* - /usr/lib/libcalligrakdgantt.s* + /usr/lib/libkplatokernel.so* + /usr/lib/libkplatomodels.so* + /usr/lib/libcalligrakdgantt.so* /usr/share/kde4/config/planworkrc /usr/share/config.kcfg/plan*.kcfg /usr/share/appdata/plan.appdata.xml @@ -607,9 +607,9 @@ libspnav - /usr/lib/libkformula.s* + /usr/lib/libkformula.so* /usr/lib/kde4/kolcmsengine.so - /usr/lib/libcalligrakdchart.s* + /usr/lib/libcalligrakdchart.so* /usr/share/color/icc/pigment/CMY.icm /usr/lib/kde4/koreport_webplugin.so /usr/lib/kde4/koreport_mapsplugin.so @@ -830,14 +830,14 @@ /usr/share/kde4/config/sheetsrc /usr/lib/kde4/sheetssolver.so /usr/share/doc/kde4/HTML/en/sheets/ - /usr/lib/libcalligrasheetsodf.s* + /usr/lib/libcalligrasheetsodf.so* /usr/lib/kde4/kspreadmathmodule.so /usr/lib/kde4/kspreadtextmodule.so /usr/lib/kde4/krossmodulesheets.so /usr/share/appdata/sheets.appdata.xml /usr/share/pixmaps/calligra-sheets.png /usr/lib/kde4/kspreadlogicmodule.so - /usr/lib/libcalligrasheetscommon.s* + /usr/lib/libcalligrasheetscommon.so* /usr/lib/kde4/calligrasheetspart.so /usr/share/kde4/config.kcfg/sheets.kcfg /usr/lib/kde4/kspreadbitopsmodule.so @@ -883,7 +883,7 @@ /usr/lib/kde4/kpr_pageeffect_*.so /usr/share/pixmaps/calligra-stage.png /usr/lib/kde4/calligrastagepart.so - /usr/lib/libcalligrastageprivate.s* + /usr/lib/libcalligrastageprivate.so* /usr/lib/libkdeinit4_calligrastage.so /usr/share/applications/kde4/stage.desktop /usr/share/kde4/servicetypes/kpr_tool.desktop From 483cf0349e2abd57d2f835a5e88a3c8e569242b9 Mon Sep 17 00:00:00 2001 From: namso-01 Date: Wed, 29 Jul 2015 21:26:58 +0300 Subject: [PATCH 2/3] calligra-tools: obsoleted --- pisi-index.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pisi-index.xml b/pisi-index.xml index 6e05447e22..ef63e31f06 100644 --- a/pisi-index.xml +++ b/pisi-index.xml @@ -399,6 +399,7 @@ qt-gtk-engine icon-theme-lxde libmenu-cache + calligra-tools lxqt-config-randr From 4b4f6f8efae655875e6c5545cde4ea8202879619 Mon Sep 17 00:00:00 2001 From: namso-01 Date: Wed, 29 Jul 2015 22:35:16 +0300 Subject: [PATCH 3/3] =?UTF-8?q?calligra:=20kde-workspace=20ile=20=C3=A7ak?= =?UTF-8?q?=C4=B1=C5=9Fmas=C4=B1=20engellendi.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extra/office/calligra/calligra/actions.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/extra/office/calligra/calligra/actions.py b/extra/office/calligra/calligra/actions.py index 84223ddbe7..160a6fe7a8 100644 --- a/extra/office/calligra/calligra/actions.py +++ b/extra/office/calligra/calligra/actions.py @@ -22,6 +22,11 @@ def install(): kde4.install("DESTDIR=%s" % get.installDIR()) pisitools.dodoc("COPYING*", "README", "doc/status.txt") + + #confilicts from kde-workspace package + pisitools.remove("/usr/share/kde4/apps/color-schemes/KritaDark.colors") + pisitools.remove("/usr/share/kde4/apps/color-schemes/KritaBright.colors") + pisitools.remove("/usr/share/kde4/apps/color-schemes/KritaBlender.colors") #for pisitools.dopixmaps("braindump/data/icons/hi32-app-braindump.png") @@ -52,4 +57,4 @@ def install(): pisitools.rename("/usr/share/pixmaps/hi32-app-calligrastage.png", "calligra-stage.png") pisitools.dopixmaps("words/pics/hi32-app-calligrawords.png") - pisitools.rename("/usr/share/pixmaps/hi32-app-calligrawords.png", "calligra-words.png") \ No newline at end of file + pisitools.rename("/usr/share/pixmaps/hi32-app-calligrawords.png", "calligra-words.png")