Hello community, here is the log from the commit of package calligra for openSUSE:Factory checked in at 2015-03-05 15:39:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra (Old) and /work/SRC/openSUSE:Factory/.calligra.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra" Changes: -------- --- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2014-11-12 00:21:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2015-03-05 18:16:04.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Mar 2 15:24:33 UTC 2015 - hrvoje.sen...@gmail.com + +- Added patches from upstream: + restore-old-installation-location-of-app-desktop-files.patch and + let-calligra-okular-plugins-be-less-aggressively-go-for-being-file-handler.patch + +------------------------------------------------------------------- +Fri Feb 27 08:25:20 UTC 2015 - adr...@suse.de + +- Update to 2.9.0: + See https://www.calligra.org/news/calligra-2-9-released/ for details +- Drop upstream patch calligra-2.8.5-librevenge.patch + +------------------------------------------------------------------- Old: ---- calligra-2.8.5-librevenge.patch calligra-2.8.6.tar.xz New: ---- calligra-2.9.0.tar.xz let-calligra-okular-plugins-be-less-aggressively-go-for-being-file-handler.patch restore-old-installation-location-of-app-desktop-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra.spec ++++++ --- /var/tmp/diff_new_pack.9kIAZH/_old 2015-03-05 18:16:12.000000000 +0100 +++ /var/tmp/diff_new_pack.9kIAZH/_new 2015-03-05 18:16:12.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package calligra # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,27 +17,29 @@ Name: calligra -Version: 2.8.6 +Version: 2.9.0 Release: 0 Summary: Libraries and Base Files for the KDE Office Suite License: GPL-2.0+ and LGPL-2.1+ and GFDL-1.2 Group: Productivity/Office/Suite Url: http://www.calligra.org/ Source0: http://download.kde.org/stable/%{name}-%{version}/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM calligra-2.8.5-librevenge.patch fst...@suse.com -- port to librevenge based libwpg -Patch0: calligra-2.8.5-librevenge.patch +# PATCH-FIX-UPSTREAM restore-old-installation-location-of-app-desktop-files.patch +Patch0: restore-old-installation-location-of-app-desktop-files.patch +# PATCH-FIX-UPSTREAM let-calligra-okular-plugins-be-less-aggressively-go-for-being-file-handler.patch +Patch1: let-calligra-okular-plugins-be-less-aggressively-go-for-being-file-handler.patch %if 0%{?suse_version} > 1230 BuildRequires: OpenColorIO-devel %endif BuildRequires: OpenEXR-devel BuildRequires: create-resources +BuildRequires: eigen3-devel BuildRequires: fdupes BuildRequires: fftw3-devel BuildRequires: freetds-devel BuildRequires: glew-devel BuildRequires: gsl-devel BuildRequires: libQtWebKit-devel -BuildRequires: libeigen2-devel BuildRequires: libexiv2-devel BuildRequires: libgsf-devel BuildRequires: libicu-devel @@ -50,6 +52,7 @@ BuildRequires: libpqxx-devel BuildRequires: libqca2-devel BuildRequires: librcps-devel +BuildRequires: libsoprano-devel BuildRequires: libspnav-devel BuildRequires: marble-devel BuildRequires: mysql-devel @@ -181,6 +184,24 @@ %description flow Flow is the flow chart drawing application of the Calligra Suite. +%package active +Summary: Tablet UI +License: GPL-2.0+ and LGPL-2.1+ +Group: Productivity/Office/Suite +Requires: %{name} = %{version} +%{kde4_runtime_requires} + +%description active + +%package gemini +Summary: Tablet UI +License: GPL-2.0+ and LGPL-2.1+ +Group: Productivity/Office/Suite +Requires: %{name} = %{version} +%{kde4_runtime_requires} + +%description gemini + %package karbon Summary: Vector Drawing Application License: GPL-2.0+ and LGPL-2.1+ @@ -402,18 +423,19 @@ %prep %setup -q -%if 0%{?suse_version} > 1310 %patch0 -p1 -%endif - +%patch1 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" krita/plugins/extensions/gmic/CImg.h -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" krita/plugins/extensions/gmic/CImg.h +sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" krita/plugins/extensions/gmic/src/CImg.h +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" krita/plugins/extensions/gmic/src/CImg.h +# icons are missing +sed -i /^Icon=calligramobile/d active/calligraactive.desktop +sed -i /^Icon=calligragemini/d gemini/calligragemini.desktop %build -%cmake_kde4 -d build -- -DBUILD_active=false -DIHAVEPATCHEDQT=true +%cmake_kde4 -d build -- -DIHAVEPATCHEDQT=true %{make_jobs} %install @@ -422,6 +444,7 @@ # Create filelists %create_subdir_filelist -d 3rdparty -f main -v devel +%create_subdir_filelist -d active -f active -v devel %create_subdir_filelist -d braindump -v devel %create_subdir_filelist -d data -f main -v devel %create_subdir_filelist -d devtools -f tools -v devel @@ -444,6 +467,7 @@ %create_subdir_filelist -d filters/stage -f stage -v devel %create_subdir_filelist -d filters/words -f words -v devel %create_subdir_filelist -d flow -v devel +%create_subdir_filelist -d gemini -v devel %create_subdir_filelist -d interfaces -f main -v devel %create_subdir_filelist -d karbon -v devel %create_subdir_filelist -d kexi -v devel @@ -481,12 +505,13 @@ %suse_update_desktop_file -r kexi Qt KDE Office Database %suse_update_desktop_file -r krita Qt KDE Graphics RasterGraphics %suse_update_desktop_file -r kritasketch Qt KDE Graphics RasterGraphics -%suse_update_desktop_file -r kritagemini Qt KDE Graphics RasterGraphics %suse_update_desktop_file -r plan Qt KDE Office ProjectManagement %suse_update_desktop_file -r planwork Qt KDE Office ProjectManagement %suse_update_desktop_file -r stage Qt KDE Office Presentation %suse_update_desktop_file -r sheets Qt KDE Office Spreadsheet %suse_update_desktop_file -r words Qt KDE Office WordProcessor +%suse_update_desktop_file -r calligraactive Qt KDE Graphics RasterGraphics +%suse_update_desktop_file -r calligragemini Qt KDE Graphics RasterGraphics %{kde_post_install} @@ -567,9 +592,13 @@ %dir %{_kde4_iconsdir}/hicolor/* %dir %{_kde4_iconsdir}/hicolor/*/* %dir %{_kde4_servicesdir}/calligra/ +%dir %{_kde4_servicesdir}/ServiceMenus +%dir %{_kde4_servicesdir}/ServiceMenus/calligra +%dir %{_libdir}/calligra/imports/org/calligra %exclude %{_kde4_modulesdir}/kexi*.so -%exclude %{_kde4_servicesdir}/calligra/kexi*.desktop -%exclude %{_kde4_servicesdir}/kexi*.desktop +%exclude %{_kde4_servicesdir}/calligra/keximigrate_spreadsheet.desktop +%exclude %{_kde4_servicesdir}/calligra/kexidb_sqlite3driver.desktop +%{_libdir}/calligra/imports/org/calligra/CalligraComponents %files devel -f filelists/devel %defattr(-,root,root,-) @@ -584,16 +613,21 @@ %files extras-okular -f filelists/okular %defattr(-,root,root,-) +%{_kde4_applicationsdir}/okularApplication_odt.desktop +%{_libdir}/kde4/okularGenerator_odt.so +%{_kde4_servicesdir}/okularOdt.desktop +%{_kde4_servicesdir}/libokularGenerator_odt.desktop + +%files active -f filelists/active +%defattr(-,root,root,-) %files author %defattr(-,root,root,-) -%{_kde4_applicationsdir}/author.desktop %{_kde4_appsdir}/author/ %{_kde4_bindir}/calligraauthor %{_kde4_configdir}/authorrc %{_kde4_iconsdir}/hicolor/*/apps/calligraauthor.* %{_kde4_libdir}/libkdeinit4_calligraauthor.so -%{_kde4_servicesdir}/authorpart.desktop %files braindump -f filelists/braindump %defattr(-,root,root,-) @@ -609,6 +643,12 @@ %doc %lang(en) %{_kde4_htmldir}/en/sheets/ %doc %lang(en) %{_kde4_htmldir}/en/stage/ +%files gemini -f filelists/gemini +%defattr(-,root,root,-) +%dir %{_libdir}/calligra/imports/Calligra +%dir %{_libdir}/calligra/imports/Calligra/Gemini +%dir %{_libdir}/calligra/imports/Calligra/Gemini/Dropbox + %files flow -f filelists/flow %defattr(-,root,root,-) %doc flow/AUTHORS flow/CHANGELOG flow/CHANGES flow/LICENSE flow/NOTES flow/README @@ -714,7 +754,6 @@ %files words %defattr(-,root,root,-) -%{_kde4_applicationsdir}/words.desktop %{_kde4_appsdir}/words/words.rc %{_kde4_appsdir}/words/words_readonly.rc %{_kde4_bindir}/calligrawords @@ -724,8 +763,6 @@ %files words-common -f filelists/words %defattr(-,root,root,-) -%exclude %{_kde4_applicationsdir}/author.desktop -%exclude %{_kde4_applicationsdir}/words.desktop %exclude %{_kde4_appsdir}/author %exclude %{_kde4_appsdir}/words/words.rc %exclude %{_kde4_appsdir}/words/words_readonly.rc @@ -737,7 +774,6 @@ %exclude %{_kde4_iconsdir}/hicolor/*/apps/calligrawords.* %exclude %{_kde4_libdir}/libkdeinit4_calligrawords.so %exclude %{_kde4_libdir}/libkdeinit4_calligraauthor.so -%exclude %{_kde4_servicesdir}/authorpart.desktop %dir %{_kde4_appsdir}/words/ %changelog ++++++ calligra-2.8.6.tar.xz -> calligra-2.9.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/calligra/calligra-2.8.6.tar.xz /work/SRC/openSUSE:Factory/.calligra.new/calligra-2.9.0.tar.xz differ: char 26, line 1 ++++++ let-calligra-okular-plugins-be-less-aggressively-go-for-being-file-handler.patch ++++++ >From 737e3d326068d9001da4ec7cdf9caa34951c42e5 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" <kosse...@kde.org> Date: Wed, 25 Feb 2015 20:09:43 +0100 Subject: [PATCH 1/2] Let Calligra Okular plugins be less aggressively go for being file handler --- extras/okularodpgenerator/okularApplication_odp.desktop | 2 +- extras/okularodtgenerator/okularApplication_odt.desktop | 2 +- filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop | 2 +- filters/stage/pptx/okularApplication_pptx_calligra.desktop | 2 +- filters/words/docx/import/okularApplication_docx_calligra.desktop | 2 +- filters/words/msword-odf/okularApplication_doc_calligra.desktop | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extras/okularodpgenerator/okularApplication_odp.desktop b/extras/okularodpgenerator/okularApplication_odp.desktop index 9331a9f..eb83723 100644 --- a/extras/okularodpgenerator/okularApplication_odp.desktop +++ b/extras/okularodpgenerator/okularApplication_odp.desktop @@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器 Exec=okular %U %i -caption %c Icon=okular Type=Application -InitialPreference=7 +InitialPreference=3 Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true diff --git a/extras/okularodtgenerator/okularApplication_odt.desktop b/extras/okularodtgenerator/okularApplication_odt.desktop index 5cf6a5e..32cd785 100644 --- a/extras/okularodtgenerator/okularApplication_odt.desktop +++ b/extras/okularodtgenerator/okularApplication_odt.desktop @@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器 Exec=okular %U %i -caption %c Icon=okular Type=Application -InitialPreference=7 +InitialPreference=3 Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true diff --git a/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop b/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop index e4f86b1..6697d75 100644 --- a/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop +++ b/filters/stage/powerpoint/okularApplication_powerpoint_calligra.desktop @@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器 Exec=okular %U %i -caption %c Icon=okular Type=Application -InitialPreference=7 +InitialPreference=3 Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true diff --git a/filters/stage/pptx/okularApplication_pptx_calligra.desktop b/filters/stage/pptx/okularApplication_pptx_calligra.desktop index ab49821..ffe6c21 100644 --- a/filters/stage/pptx/okularApplication_pptx_calligra.desktop +++ b/filters/stage/pptx/okularApplication_pptx_calligra.desktop @@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器 Exec=okular %U %i -caption %c Icon=okular Type=Application -InitialPreference=7 +InitialPreference=3 Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true diff --git a/filters/words/docx/import/okularApplication_docx_calligra.desktop b/filters/words/docx/import/okularApplication_docx_calligra.desktop index 9f0e477..baa69e5 100644 --- a/filters/words/docx/import/okularApplication_docx_calligra.desktop +++ b/filters/words/docx/import/okularApplication_docx_calligra.desktop @@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器 Exec=okular %U %i -caption %c Icon=okular Type=Application -InitialPreference=7 +InitialPreference=3 Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true diff --git a/filters/words/msword-odf/okularApplication_doc_calligra.desktop b/filters/words/msword-odf/okularApplication_doc_calligra.desktop index 3ee20a8..f93c2b2 100644 --- a/filters/words/msword-odf/okularApplication_doc_calligra.desktop +++ b/filters/words/msword-odf/okularApplication_doc_calligra.desktop @@ -89,6 +89,6 @@ GenericName[zh_TW]=文件檢視器 Exec=okular %U %i -caption %c Icon=okular Type=Application -InitialPreference=7 +InitialPreference=3 Categories=Qt;KDE;Graphics;Viewer; NoDisplay=true -- 2.1.0 ++++++ restore-old-installation-location-of-app-desktop-files.patch ++++++ >From 6908abb9610cc2faf4014ea012c4db5706655463 Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" <kosse...@kde.org> Date: Thu, 26 Feb 2015 23:25:05 +0100 Subject: [PATCH 2/2] Restore old installation location of app desktop files Needed because the id of desktop files is generated from the relative path to the respective $XDG_DATA_DIRS/application, and by having changed the install location the id will be a different, so anything using the id, like bookmars/shortcuts, will suddenly fail. See http://specs.freedesktop.org/menu-spec/menu-spec-latest.html#term-desktop-file-id Partially reverts 5236815e940fc090279eee01eb34ed355349b4b4 --- active/CMakeLists.txt | 2 +- braindump/data/CMakeLists.txt | 2 +- doc/CMakeLists.txt | 2 +- filters/stage/powerpoint/CMakeLists.txt | 2 +- filters/stage/pptx/CMakeLists.txt | 2 +- filters/words/ascii/CMakeLists.txt | 2 +- filters/words/docx/import/CMakeLists.txt | 2 +- filters/words/msword-odf/CMakeLists.txt | 2 +- filters/words/wordperfect/import/CMakeLists.txt | 2 +- flow/part/CMakeLists.txt | 2 +- karbon/data/CMakeLists.txt | 2 +- kexi/CMakeLists.txt | 2 +- krita/CMakeLists.txt | 2 +- krita/gemini/CMakeLists.txt | 2 +- krita/plugins/formats/bmp/CMakeLists.txt | 2 +- krita/plugins/formats/eps/CMakeLists.txt | 2 +- krita/plugins/formats/exr/CMakeLists.txt | 2 +- krita/plugins/formats/heightmap/CMakeLists.txt | 2 +- krita/plugins/formats/jp2/CMakeLists.txt | 2 +- krita/plugins/formats/jpeg/CMakeLists.txt | 2 +- krita/plugins/formats/odg/CMakeLists.txt | 2 +- krita/plugins/formats/oiio/CMakeLists.txt | 4 ++-- krita/plugins/formats/ora/CMakeLists.txt | 2 +- krita/plugins/formats/pdf/CMakeLists.txt | 2 +- krita/plugins/formats/png/CMakeLists.txt | 2 +- krita/plugins/formats/ppm/CMakeLists.txt | 2 +- krita/plugins/formats/psd/CMakeLists.txt | 2 +- krita/plugins/formats/raw/CMakeLists.txt | 2 +- krita/plugins/formats/tga/CMakeLists.txt | 2 +- krita/plugins/formats/tiff/CMakeLists.txt | 2 +- krita/plugins/formats/xcf/CMakeLists.txt | 2 +- krita/sketch/CMakeLists.txt | 2 +- plan/CMakeLists.txt | 2 +- plan/workpackage/CMakeLists.txt | 2 +- sheets/CMakeLists.txt | 2 +- stage/app/CMakeLists.txt | 2 +- words/app/CMakeLists.txt | 2 +- words/part/CMakeLists.txt | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/active/CMakeLists.txt b/active/CMakeLists.txt index a2fe0da..881e203 100644 --- a/active/CMakeLists.txt +++ b/active/CMakeLists.txt @@ -68,5 +68,5 @@ endif( SHOULD_BUILD_FEATURE_RDF ) install(TARGETS calligraactive RUNTIME DESTINATION bin) -install(FILES calligraactive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install(FILES calligraactive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(DIRECTORY qml DESTINATION share/calligraactive) diff --git a/braindump/data/CMakeLists.txt b/braindump/data/CMakeLists.txt index f5df58e..b67d164 100644 --- a/braindump/data/CMakeLists.txt +++ b/braindump/data/CMakeLists.txt @@ -12,5 +12,5 @@ install( FILES braindumpui.rc braindumpview.rc DESTINATION ${DATA_INSTALL_DIR}/b install( FILES import/zoom-pixels.png DESTINATION ${DATA_INSTALL_DIR}/braindump/icons/hicolor/22x22/actions) ### desktop files ### -install( PROGRAMS braindump.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS braindump.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install( FILES braindump.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 91c8d20..0b4e238 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -8,4 +8,4 @@ endif(SHOULD_BUILD_STAGE) if(SHOULD_BUILD_SHEETS) add_subdirectory(sheets) endif(SHOULD_BUILD_SHEETS) -INSTALL(FILES calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +INSTALL(FILES calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/filters/stage/powerpoint/CMakeLists.txt b/filters/stage/powerpoint/CMakeLists.txt index 53743fc..d569d8d 100644 --- a/filters/stage/powerpoint/CMakeLists.txt +++ b/filters/stage/powerpoint/CMakeLists.txt @@ -31,5 +31,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL) if(SHOULD_BUILD_OKULARGENERATOR_PPT) install( FILES libokularGenerator_powerpoint_calligra.desktop okularPowerpoint_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra ) - install( PROGRAMS okularApplication_powerpoint_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra ) + install( PROGRAMS okularApplication_powerpoint_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) endif(SHOULD_BUILD_OKULARGENERATOR_PPT) diff --git a/filters/stage/pptx/CMakeLists.txt b/filters/stage/pptx/CMakeLists.txt index 36434f9..b48615c 100644 --- a/filters/stage/pptx/CMakeLists.txt +++ b/filters/stage/pptx/CMakeLists.txt @@ -45,5 +45,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL) if(SHOULD_BUILD_OKULARGENERATOR_PPTX) install( FILES libokularGenerator_pptx_calligra.desktop okularPptx_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra ) - install( PROGRAMS okularApplication_pptx_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra ) + install( PROGRAMS okularApplication_pptx_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) endif(SHOULD_BUILD_OKULARGENERATOR_PPTX) diff --git a/filters/words/ascii/CMakeLists.txt b/filters/words/ascii/CMakeLists.txt index ae4eac3..45de65e 100644 --- a/filters/words/ascii/CMakeLists.txt +++ b/filters/words/ascii/CMakeLists.txt @@ -37,7 +37,7 @@ install(TARGETS calligra_filter_odt2ascii DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES calligra_filter_odt2ascii.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS calligrawords_ascii.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS calligrawords_ascii.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) endif(SHOULD_BUILD_FILTER_ODT_TO_ASCII) diff --git a/filters/words/docx/import/CMakeLists.txt b/filters/words/docx/import/CMakeLists.txt index 70490d4..70edffb 100644 --- a/filters/words/docx/import/CMakeLists.txt +++ b/filters/words/docx/import/CMakeLists.txt @@ -75,5 +75,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL) if(SHOULD_BUILD_OKULAR_GENERATOR_DOCX) install( FILES libokularGenerator_docx_calligra.desktop okularDocx_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra ) - install( PROGRAMS okularApplication_docx_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra ) + install( PROGRAMS okularApplication_docx_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) endif(SHOULD_BUILD_OKULAR_GENERATOR_DOCX) diff --git a/filters/words/msword-odf/CMakeLists.txt b/filters/words/msword-odf/CMakeLists.txt index 2b975a1..36a35f4 100644 --- a/filters/words/msword-odf/CMakeLists.txt +++ b/filters/words/msword-odf/CMakeLists.txt @@ -37,5 +37,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL) if(SHOULD_BUILD_OKULAR_GENERATOR_DOC) install( FILES libokularGenerator_doc_calligra.desktop okularDoc_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra ) - install( PROGRAMS okularApplication_doc_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra ) + install( PROGRAMS okularApplication_doc_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) endif(SHOULD_BUILD_OKULAR_GENERATOR_DOC) diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/words/wordperfect/import/CMakeLists.txt index a9d034b..219ee4c 100644 --- a/filters/words/wordperfect/import/CMakeLists.txt +++ b/filters/words/wordperfect/import/CMakeLists.txt @@ -29,5 +29,5 @@ endif(SHOULD_BUILD_FILEMANAGER_THUMBNAIL) if(SHOULD_BUILD_OKULAR_GENERATOR_WORDPERFECT) install( FILES libokularGenerator_wpd_calligra.desktop okularWpd_calligra.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra ) - install( PROGRAMS okularApplication_wpd_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra ) + install( PROGRAMS okularApplication_wpd_calligra.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) endif(SHOULD_BUILD_OKULAR_GENERATOR_WORDPERFECT) diff --git a/flow/part/CMakeLists.txt b/flow/part/CMakeLists.txt index 6a02497..58882f1 100644 --- a/flow/part/CMakeLists.txt +++ b/flow/part/CMakeLists.txt @@ -48,7 +48,7 @@ install(TARGETS calligraflow ${INSTALL_TARGETS_DEFAULT_ARGS}) ### desktop files ### install( FILES flowpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS flow.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS flow.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install( FILES flow.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/) ### GUI files ### diff --git a/karbon/data/CMakeLists.txt b/karbon/data/CMakeLists.txt index 009fb37..a3777e4 100644 --- a/karbon/data/CMakeLists.txt +++ b/karbon/data/CMakeLists.txt @@ -4,6 +4,6 @@ install( FILES karbon_viewplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DI install( FILES karbon_dock.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) install( FILES karbonpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) install( FILES karbon.rc karbon_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/karbon) -install( PROGRAMS karbon.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS karbon.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install( FILES karbon.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/) install( FILES karbonrc DESTINATION ${CONFIG_INSTALL_DIR} ) diff --git a/kexi/CMakeLists.txt b/kexi/CMakeLists.txt index 4ad17e5..8058667 100644 --- a/kexi/CMakeLists.txt +++ b/kexi/CMakeLists.txt @@ -100,7 +100,7 @@ ENDIF(KEXI_MOBILE) ########### install files ############### -install(PROGRAMS kexi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install(PROGRAMS kexi.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES kexi.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/) #kde4_create_doxygen_docs( EXCLUDE 3rdparty kexidb/parser/sqlparser.h kexidb/drivers/odbc ) diff --git a/krita/CMakeLists.txt b/krita/CMakeLists.txt index dc25e2b..26f1a2c 100644 --- a/krita/CMakeLists.txt +++ b/krita/CMakeLists.txt @@ -163,7 +163,7 @@ if (Q_WS_MAC) endif (Q_WS_MAC) install(TARGETS krita ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS krita.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install(PROGRAMS krita.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES krita.rc DESTINATION ${DATA_INSTALL_DIR}/krita) install(FILES krita.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions) install(FILES krita.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ ) diff --git a/krita/gemini/CMakeLists.txt b/krita/gemini/CMakeLists.txt index 40bdd15..fda9c18 100644 --- a/krita/gemini/CMakeLists.txt +++ b/krita/gemini/CMakeLists.txt @@ -42,7 +42,7 @@ target_link_libraries(kritagemini ) install(TARGETS kritagemini ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS kritagemini.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install(PROGRAMS kritagemini.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES kritageminirc kritageminipanelsrc DESTINATION ${CONFIG_INSTALL_DIR} ) install(FILES kritagemini.qml DESTINATION ${DATA_INSTALL_DIR}/kritagemini) install(FILES kritagemini.rc DESTINATION ${DATA_INSTALL_DIR}/kritagemini) diff --git a/krita/plugins/formats/bmp/CMakeLists.txt b/krita/plugins/formats/bmp/CMakeLists.txt index 429d34b..c2bff3f 100644 --- a/krita/plugins/formats/bmp/CMakeLists.txt +++ b/krita/plugins/formats/bmp/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries(kritabmpimport kritaui) install(TARGETS kritabmpimport DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES krita_bmp_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_bmp.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_bmp.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/eps/CMakeLists.txt b/krita/plugins/formats/eps/CMakeLists.txt index aae923b..2c394dd 100644 --- a/krita/plugins/formats/eps/CMakeLists.txt +++ b/krita/plugins/formats/eps/CMakeLists.txt @@ -37,4 +37,4 @@ install(TARGETS kritaepsexport DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_eps_import.desktop krita_eps_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_eps.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_eps.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/exr/CMakeLists.txt b/krita/plugins/formats/exr/CMakeLists.txt index 67b905a..e3c7fbb 100644 --- a/krita/plugins/formats/exr/CMakeLists.txt +++ b/krita/plugins/formats/exr/CMakeLists.txt @@ -47,4 +47,4 @@ install( FILES DESTINATION ${DATA_INSTALL_DIR}/krita/metadata/schemas) install( FILES krita_exr_import.desktop krita_exr_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_exr.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_exr.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/heightmap/CMakeLists.txt b/krita/plugins/formats/heightmap/CMakeLists.txt index bae2605..0f1a7a6 100644 --- a/krita/plugins/formats/heightmap/CMakeLists.txt +++ b/krita/plugins/formats/heightmap/CMakeLists.txt @@ -29,4 +29,4 @@ install(TARGETS kritaheightmapexport DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_heightmap_import.desktop krita_heightmap_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_heightmap.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_heightmap.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/jp2/CMakeLists.txt b/krita/plugins/formats/jp2/CMakeLists.txt index d64330b..4ed2d65 100644 --- a/krita/plugins/formats/jp2/CMakeLists.txt +++ b/krita/plugins/formats/jp2/CMakeLists.txt @@ -38,4 +38,4 @@ install(TARGETS kritajp2export DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_jp2_import.desktop krita_jp2_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_jp2.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_jp2.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/jpeg/CMakeLists.txt b/krita/plugins/formats/jpeg/CMakeLists.txt index 8403024..d20c631 100644 --- a/krita/plugins/formats/jpeg/CMakeLists.txt +++ b/krita/plugins/formats/jpeg/CMakeLists.txt @@ -51,4 +51,4 @@ install(TARGETS kritajpegexport DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_jpeg_import.desktop krita_jpeg_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_jpeg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_jpeg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/odg/CMakeLists.txt b/krita/plugins/formats/odg/CMakeLists.txt index af3bba5..6952786 100644 --- a/krita/plugins/formats/odg/CMakeLists.txt +++ b/krita/plugins/formats/odg/CMakeLists.txt @@ -16,4 +16,4 @@ target_link_libraries(kritaodgimport kritaui ${PNG_LIBRARIES} ) install(TARGETS kritaodgimport DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES krita_odg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_odg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_odg.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/oiio/CMakeLists.txt b/krita/plugins/formats/oiio/CMakeLists.txt index 6714081..3f95822 100644 --- a/krita/plugins/formats/oiio/CMakeLists.txt +++ b/krita/plugins/formats/oiio/CMakeLists.txt @@ -11,7 +11,7 @@ target_link_libraries(kritaoiioexport kritaui ${OIIO_LIBRARIES}) install(TARGETS kritaoiioexport DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES krita_oiio_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_oiio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_oiio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) set(kritaoiioimport_PART_SRCS kis_oiio_import.cpp @@ -26,4 +26,4 @@ target_link_libraries(kritaoiioimport kritaui ${OIIO_LIBRARIES}) install(TARGETS kritaoiioimport DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES krita_oiio_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_oiio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_oiio.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/ora/CMakeLists.txt b/krita/plugins/formats/ora/CMakeLists.txt index e36af88..430294c 100644 --- a/krita/plugins/formats/ora/CMakeLists.txt +++ b/krita/plugins/formats/ora/CMakeLists.txt @@ -34,7 +34,7 @@ install(TARGETS kritaoraexport DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_ora_import.desktop krita_ora_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_ora.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_ora.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) if(SHOULD_BUILD_FILEMANAGER_THUMBNAIL) install( FILES krita_ora_thumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) diff --git a/krita/plugins/formats/pdf/CMakeLists.txt b/krita/plugins/formats/pdf/CMakeLists.txt index b2b0ea3..f980887 100644 --- a/krita/plugins/formats/pdf/CMakeLists.txt +++ b/krita/plugins/formats/pdf/CMakeLists.txt @@ -17,4 +17,4 @@ install(TARGETS kritapdfimport DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_pdf_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_pdf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_pdf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/png/CMakeLists.txt b/krita/plugins/formats/png/CMakeLists.txt index 4fdddbf..9f98858 100644 --- a/krita/plugins/formats/png/CMakeLists.txt +++ b/krita/plugins/formats/png/CMakeLists.txt @@ -34,4 +34,4 @@ target_link_libraries(kritapngexport kritaui ${PNG_LIBRARIES}) install(TARGETS kritapngexport DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES krita_png_import.desktop krita_png_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_png.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_png.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/ppm/CMakeLists.txt b/krita/plugins/formats/ppm/CMakeLists.txt index 21cbfa2..fe5dd46 100644 --- a/krita/plugins/formats/ppm/CMakeLists.txt +++ b/krita/plugins/formats/ppm/CMakeLists.txt @@ -29,4 +29,4 @@ install(TARGETS kritappmexport DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_ppm_import.desktop krita_ppm_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_ppm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_ppm.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/psd/CMakeLists.txt b/krita/plugins/formats/psd/CMakeLists.txt index 05e808a..451560c 100644 --- a/krita/plugins/formats/psd/CMakeLists.txt +++ b/krita/plugins/formats/psd/CMakeLists.txt @@ -54,4 +54,4 @@ install(TARGETS kritapsdexport DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES krita_psd_import.desktop krita_psd_export.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_psd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_psd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/raw/CMakeLists.txt b/krita/plugins/formats/raw/CMakeLists.txt index c5d6750..b565f3e 100644 --- a/krita/plugins/formats/raw/CMakeLists.txt +++ b/krita/plugins/formats/raw/CMakeLists.txt @@ -26,5 +26,5 @@ install(TARGETS krita_raw_import DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_raw_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_raw.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_raw.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/tga/CMakeLists.txt b/krita/plugins/formats/tga/CMakeLists.txt index 57be30c..da62d62 100644 --- a/krita/plugins/formats/tga/CMakeLists.txt +++ b/krita/plugins/formats/tga/CMakeLists.txt @@ -24,4 +24,4 @@ target_link_libraries(kritatgaimport kritaui) install(TARGETS kritatgaimport DESTINATION ${PLUGIN_INSTALL_DIR}) install( FILES krita_tga_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_tga.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_tga.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/tiff/CMakeLists.txt b/krita/plugins/formats/tiff/CMakeLists.txt index 6cacb32..e9142da 100644 --- a/krita/plugins/formats/tiff/CMakeLists.txt +++ b/krita/plugins/formats/tiff/CMakeLists.txt @@ -50,5 +50,5 @@ install(TARGETS kritatiffexport DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### install( FILES krita_tiff_export.desktop krita_tiff_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_tiff.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_tiff.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/plugins/formats/xcf/CMakeLists.txt b/krita/plugins/formats/xcf/CMakeLists.txt index 8e484c2..f79187d 100644 --- a/krita/plugins/formats/xcf/CMakeLists.txt +++ b/krita/plugins/formats/xcf/CMakeLists.txt @@ -29,4 +29,4 @@ endif (WIN32) ########### install files ############### install( FILES krita_xcf_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS krita_xcf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS krita_xcf.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/krita/sketch/CMakeLists.txt b/krita/sketch/CMakeLists.txt index dbbce96..785750f 100644 --- a/krita/sketch/CMakeLists.txt +++ b/krita/sketch/CMakeLists.txt @@ -149,7 +149,7 @@ target_link_libraries(kritasketch ) #install(TARGETS kritasketch ${INSTALL_TARGETS_DEFAULT_ARGS}) -install(PROGRAMS kritasketch.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install(PROGRAMS kritasketch.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(FILES kritasketchrc kritasketchpanelsrc DESTINATION ${CONFIG_INSTALL_DIR} ) install(FILES kritasketch.qml DESTINATION ${DATA_INSTALL_DIR}/kritasketch) install(FILES kritasketch.rc DESTINATION ${DATA_INSTALL_DIR}/kritasketch) diff --git a/plan/CMakeLists.txt b/plan/CMakeLists.txt index 279d988..95843ed 100644 --- a/plan/CMakeLists.txt +++ b/plan/CMakeLists.txt @@ -143,7 +143,7 @@ install(TARGETS calligraplan ${INSTALL_TARGETS_DEFAULT_ARGS}) install( FILES planpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) install( FILES plan.rc plan_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/plan) -install( PROGRAMS plan.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS plan.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install( FILES planrc DESTINATION ${CONFIG_INSTALL_DIR}) install(FILES plansettings.kcfg DESTINATION ${KCFG_INSTALL_DIR}) install( FILES plan_viewplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) diff --git a/plan/workpackage/CMakeLists.txt b/plan/workpackage/CMakeLists.txt index 86c97e8..b208ea7 100644 --- a/plan/workpackage/CMakeLists.txt +++ b/plan/workpackage/CMakeLists.txt @@ -119,5 +119,5 @@ install(TARGETS calligraplanwork ${INSTALL_TARGETS_DEFAULT_ARGS}) install( FILES planworkpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) install( FILES planwork.rc planwork_readonly.rc planwork_mainwindow.rc DESTINATION ${DATA_INSTALL_DIR}/planwork) install( FILES planworkrc DESTINATION ${CONFIG_INSTALL_DIR}) -install( PROGRAMS planwork.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS planwork.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) diff --git a/sheets/CMakeLists.txt b/sheets/CMakeLists.txt index e02967d..40c824e 100644 --- a/sheets/CMakeLists.txt +++ b/sheets/CMakeLists.txt @@ -426,7 +426,7 @@ install(TARGETS kdeinit_calligrasheets ${INSTALL_TARGETS_DEFAULT_ARGS}) target_link_libraries( calligrasheets kdeinit_calligrasheets ) install(TARGETS calligrasheets ${INSTALL_TARGETS_DEFAULT_ARGS}) -install( PROGRAMS sheets.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS sheets.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install( FILES sheets.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/) endif (SHOULD_BUILD_APP_SHEETS) diff --git a/stage/app/CMakeLists.txt b/stage/app/CMakeLists.txt index a483a49..9370b9c 100644 --- a/stage/app/CMakeLists.txt +++ b/stage/app/CMakeLists.txt @@ -25,5 +25,5 @@ install(TARGETS kdeinit_calligrastage ${INSTALL_TARGETS_DEFAULT_ARGS}) target_link_libraries(calligrastage kdeinit_calligrastage) install(TARGETS calligrastage ${INSTALL_TARGETS_DEFAULT_ARGS}) -install( PROGRAMS stage.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS stage.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install( FILES stage.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/) diff --git a/words/app/CMakeLists.txt b/words/app/CMakeLists.txt index 8e32aaa..61d5180 100644 --- a/words/app/CMakeLists.txt +++ b/words/app/CMakeLists.txt @@ -23,5 +23,5 @@ install(TARGETS kdeinit_calligrawords ${INSTALL_TARGETS_DEFAULT_ARGS}) target_link_libraries( calligrawords kdeinit_calligrawords ) install(TARGETS calligrawords ${INSTALL_TARGETS_DEFAULT_ARGS}) -install( PROGRAMS words.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS words.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install( FILES words.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/) diff --git a/words/part/CMakeLists.txt b/words/part/CMakeLists.txt index bce2d47..6bb0b40 100644 --- a/words/part/CMakeLists.txt +++ b/words/part/CMakeLists.txt @@ -210,7 +210,7 @@ install(TARGETS calligraauthor ${INSTALL_TARGETS_DEFAULT_ARGS}) install( FILES author/author.rc author/author_readonly.rc DESTINATION ${DATA_INSTALL_DIR}/author) install( FILES author/authorpart.desktop DESTINATION ${SERVICES_INSTALL_DIR}/calligra) -install( PROGRAMS author/author.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}/calligra) +install( PROGRAMS author/author.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install( FILES author/authorrc DESTINATION ${CONFIG_INSTALL_DIR} ) endif (SHOULD_BUILD_APP_AUTHOR) -- 2.1.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
