solenv/bin/assemble-flatpak-appdata.sh | 10 --- sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml | 18 ++---- sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml | 20 ++----- sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml | 20 ++----- sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml | 20 ++----- sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml | 20 ++----- sysui/desktop/appstream-appdata/org.libreoffice.kde.metainfo.xml | 26 +++------- sysui/desktop/share/create_tree.sh | 2 8 files changed, 47 insertions(+), 89 deletions(-)
New commits: commit a125266a9d33aaf068b6c01ffe37f61df84dab70 Author: Stephan Bergmann <[email protected]> AuthorDate: Wed Oct 22 11:04:01 2025 +0200 Commit: Sarper Akdemir <[email protected]> CommitDate: Thu Oct 23 11:58:07 2025 +0200 AppStream branding ...corresponding to distro/allotropia/zeta-24-2 2fefb6c73e4f57a6d3cad21942282ac37131f945 "AppStream branding" Change-Id: I40fbebc00744ac5248813c3b83c9a6321c7a1cc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192882 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Sarper Akdemir <[email protected]> diff --git a/solenv/bin/assemble-flatpak-appdata.sh b/solenv/bin/assemble-flatpak-appdata.sh index 6d4ec8ba3e24..51354ec4c474 100755 --- a/solenv/bin/assemble-flatpak-appdata.sh +++ b/solenv/bin/assemble-flatpak-appdata.sh @@ -42,12 +42,7 @@ cat <<\EOF >"${1?}"com.collabora.CollaboraOffice.appdata.xml without worrying about compatibility.</p> </description> <launchable type="desktop-id">com.collabora.CollaboraOffice.desktop</launchable> - <url type="homepage">http://www.libreoffice.org/discover/libreoffice/</url> - <url type="bugtracker">https://bugs.documentfoundation.org/</url> - <url type="donation">https://donate.libreoffice.org/</url> - <url type="faq">https://wiki.documentfoundation.org/Faq</url> - <url type="help">http://www.libreoffice.org/get-help/documentation/</url> - <url type="translate">https://wiki.documentfoundation.org/Translating_LibreOffice</url> + <url type="homepage">https://collabora.com</url> <screenshots> <screenshot type="default"> <image>https://hub.libreoffice.org/screenshots/writer-01.png</image> @@ -70,8 +65,7 @@ cat <<\EOF >"${1?}"com.collabora.CollaboraOffice.appdata.xml <caption>Sample Base document</caption> </screenshot> </screenshots> - <developer_name>The Document Foundation</developer_name> - <update_contact>libreoffice_at_lists.freedesktop.org</update_contact> + <developer_name>Collabora Limited</developer_name> <kudos> <kudo>HiDpiIcon</kudo> <kudo>HighContrast</kudo> diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml index c8918dd82f77..26c9f366467c 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> - <id>libreoffice-base.desktop</id> + <id>collaboraoffice-base.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>MPL-2.0</project_license> - <name>LibreOffice Base</name> - <summary>Database manager part of the LibreOffice productivity suite</summary> + <name>Collabora Office Base</name> + <summary>Database manager part of the Collabora Office productivity suite</summary> <description> <p> -Base is a powerful database manager, part of the LibreOffice productivity suite. +Base is a powerful database manager, part of the Collabora Office productivity suite. It allows you to store, manage and maintain different collections of data. Base makes it easy to keep track of your finances, customers, invoices, or even just the contacts in your address book! @@ -25,12 +25,7 @@ In addition, the built-in support for JDBC- and ODBC-standard drivers allows you to connect to virtually any other existing database engine as well. </p> </description> - <url type="homepage">http://www.libreoffice.org/discover/base/</url> - <url type="bugtracker">https://bugs.documentfoundation.org/</url> - <url type="donation">https://donate.libreoffice.org/</url> - <url type="faq">https://hub.libreoffice.org/faq</url> - <url type="help">http://www.libreoffice.org/get-help/documentation/</url> - <url type="translate">https://hub.libreoffice.org/translate</url> + <url type="homepage">https://collabora.com</url> <screenshots> <screenshot type="default"> <image>https://hub.libreoffice.org/screenshots/base-01.png</image> @@ -41,8 +36,7 @@ to connect to virtually any other existing database engine as well. <caption><!-- Describe this screenshot in less than ~10 words --></caption> </screenshot> </screenshots> - <developer_name>The Document Foundation</developer_name> - <update_contact>libreoffice_at_lists.freedesktop.org</update_contact> + <developer_name>Collabora Limited</developer_name> <kudos> <kudo>HiDpiIcon</kudo> <kudo>HighContrast</kudo> diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml index 8cf2755abe6a..e90f2c8bf9d2 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml @@ -1,30 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> - <id>libreoffice-calc.desktop</id> + <id>collaboraoffice-calc.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>MPL-2.0</project_license> - <name>LibreOffice Calc</name> - <summary>Spreadsheet program of the LibreOffice productivity suite</summary> + <name>Collabora Office Calc</name> + <summary>Spreadsheet program of the Collabora Office productivity suite</summary> <description> <p> -Calc is a powerful and extensible spreadsheet program, part of the LibreOffice +Calc is a powerful and extensible spreadsheet program, part of the Collabora Office productivity suite. Newcomers find it intuitive and easy to learn. Professional data miners and number crunchers will appreciate the comprehensive range of advanced functions. </p> <p> -LibreOffice supports opening and saving into a wide variety of formats, so you +Collabora Office supports opening and saving into a wide variety of formats, so you can easily share spreadsheets with users of other popular office suites without worrying about compatibility. </p> </description> - <url type="homepage">http://www.libreoffice.org/discover/calc/</url> - <url type="bugtracker">https://bugs.documentfoundation.org/</url> - <url type="donation">https://donate.libreoffice.org/</url> - <url type="faq">https://hub.libreoffice.org/faq</url> - <url type="help">http://www.libreoffice.org/get-help/documentation/</url> - <url type="translate">https://hub.libreoffice.org/translate</url> + <url type="homepage">https://collabora.com</url> <screenshots> <screenshot type="default"> <image>https://hub.libreoffice.org/screenshots/calc-01.png</image> @@ -35,8 +30,7 @@ worrying about compatibility. <caption><!-- Describe this screenshot in less than ~10 words --></caption> </screenshot> </screenshots> - <developer_name>The Document Foundation</developer_name> - <update_contact>libreoffice_at_lists.freedesktop.org</update_contact> + <developer_name>Collabora Limited</developer_name> <kudos> <kudo>HiDpiIcon</kudo> <kudo>HighContrast</kudo> diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml index df2c93e2deee..3b6b8cf792c4 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> - <id>libreoffice-draw.desktop</id> + <id>collaboraoffice-draw.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>MPL-2.0</project_license> - <name>LibreOffice Draw</name> - <summary>Graphics editor part of the LibreOffice productivity suite</summary> + <name>Collabora Office Draw</name> + <summary>Graphics editor part of the Collabora Office productivity suite</summary> <description> <p> -LibreOffice Draw is an easy-to-use graphics editor, which empowers you to create +Collabora Office Draw is an easy-to-use graphics editor, which empowers you to create anything from quick sketches to complex diagrams. It provides a powerful set of tools and shapes for producing technical drawings, charts, and much else. @@ -19,17 +19,12 @@ It also provides smart connectors that make it easy for you to build charts and diagrams, and make beautiful drawings composed of different objects. </p> <p> -LibreOffice supports opening and saving into a wide variety of formats, so you +Collabora Office supports opening and saving into a wide variety of formats, so you can easily share drawings with users of other popular office suites without worrying about compatibility. </p> </description> - <url type="homepage">http://www.libreoffice.org/discover/draw/</url> - <url type="bugtracker">https://bugs.documentfoundation.org/</url> - <url type="donation">https://donate.libreoffice.org/</url> - <url type="faq">https://hub.libreoffice.org/faq</url> - <url type="help">http://www.libreoffice.org/get-help/documentation/</url> - <url type="translate">https://hub.libreoffice.org/translate</url> + <url type="homepage">https://collabora.com</url> <screenshots> <screenshot type="default"> <image>https://hub.libreoffice.org/screenshots/draw-01.png</image> @@ -40,8 +35,7 @@ worrying about compatibility. <caption><!-- Describe this screenshot in less than ~10 words --></caption> </screenshot> </screenshots> - <developer_name>The Document Foundation</developer_name> - <update_contact>libreoffice_at_lists.freedesktop.org</update_contact> + <developer_name>Collabora Limited</developer_name> <kudos> <kudo>HiDpiIcon</kudo> <kudo>HighContrast</kudo> diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml index ec6b4fb4c89b..a740b109bd89 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> - <id>libreoffice-impress.desktop</id> + <id>collaboraoffice-impress.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>MPL-2.0</project_license> - <name>LibreOffice Impress</name> - <summary>Presentation program of the LibreOffice productivity suite</summary> + <name>Collabora Office Impress</name> + <summary>Presentation program of the Collabora Office productivity suite</summary> <description> <p> -Impress is a presentation program and part of the LibreOffice productivity suite. +Impress is a presentation program and part of the Collabora Office productivity suite. Impress is the fastest and easiest way to create effective multimedia presentations. Stunning animation and sensational special effects help you convince your audience. Create presentations that look even more professional than the standard @@ -15,17 +15,12 @@ presentations you commonly see at work. Get your colleagues’ and bosses’ att by creating something a little bit different. </p> <p> -LibreOffice supports opening and saving into a wide variety of formats, so you +Collabora Office supports opening and saving into a wide variety of formats, so you can easily share presentations with users of other popular office suites without worrying about compatibility. </p> </description> - <url type="homepage">http://www.libreoffice.org/discover/impress/</url> - <url type="bugtracker">https://bugs.documentfoundation.org/</url> - <url type="donation">https://donate.libreoffice.org/</url> - <url type="faq">https://hub.libreoffice.org/faq</url> - <url type="help">http://www.libreoffice.org/get-help/documentation/</url> - <url type="translate">https://hub.libreoffice.org/translate</url> + <url type="homepage">https://collabora.com</url> <screenshots> <screenshot type="default"> <image>https://hub.libreoffice.org/screenshots/impress-01.png</image> @@ -36,8 +31,7 @@ worrying about compatibility. <caption><!-- Describe this screenshot in less than ~10 words --></caption> </screenshot> </screenshots> - <developer_name>The Document Foundation</developer_name> - <update_contact>libreoffice_at_lists.freedesktop.org</update_contact> + <developer_name>Collabora Limited</developer_name> <kudos> <kudo>HiDpiIcon</kudo> <kudo>HighContrast</kudo> diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml index d6b10cff9e59..ed2bf5967c03 100644 --- a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml +++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> - <id>libreoffice-writer.desktop</id> + <id>collaboraoffice-writer.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>MPL-2.0</project_license> - <name>LibreOffice Writer</name> - <summary>Word processor part of the LibreOffice productivity suite</summary> + <name>Collabora Office Writer</name> + <summary>Word processor part of the Collabora Office productivity suite</summary> <description> <p> -Writer is the word processor inside LibreOffice productivity suite. +Writer is the word processor inside Collabora Office productivity suite. Use it for everything, from dashing off a quick letter to producing an entire book with tables of contents, embedded illustrations, bibliographies and diagrams. The while-you-type auto-completion, auto-formatting and automatic spell-checking @@ -21,17 +21,12 @@ various styles and formatting effects to your document and view the results immediately. </p> <p> -LibreOffice supports opening and saving into a wide variety of formats, so you +Collabora Office supports opening and saving into a wide variety of formats, so you can easily share documents with users of other popular office suites without worrying about compatibility. </p> </description> - <url type="homepage">http://www.libreoffice.org/discover/writer/</url> - <url type="bugtracker">https://bugs.documentfoundation.org/</url> - <url type="donation">https://donate.libreoffice.org/</url> - <url type="faq">https://hub.libreoffice.org/faq</url> - <url type="help">http://www.libreoffice.org/get-help/documentation/</url> - <url type="translate">https://hub.libreoffice.org/translate</url> + <url type="homepage">https://collabora.com</url> <screenshots> <screenshot type="default"> <image>https://hub.libreoffice.org/screenshots/writer-01.png</image> @@ -42,8 +37,7 @@ worrying about compatibility. <caption><!-- Describe this screenshot in less than ~10 words --></caption> </screenshot> </screenshots> - <developer_name>The Document Foundation</developer_name> - <update_contact>libreoffice_at_lists.freedesktop.org</update_contact> + <developer_name>Collabora Limited</developer_name> <kudos> <kudo>HiDpiIcon</kudo> <kudo>HighContrast</kudo> diff --git a/sysui/desktop/appstream-appdata/org.libreoffice.kde.metainfo.xml b/sysui/desktop/appstream-appdata/org.libreoffice.kde.metainfo.xml index f78ba77f3020..46e0dafffbc3 100644 --- a/sysui/desktop/appstream-appdata/org.libreoffice.kde.metainfo.xml +++ b/sysui/desktop/appstream-appdata/org.libreoffice.kde.metainfo.xml @@ -1,28 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> <component type="addon"> - <id>org.libreoffice.kde</id> + <id>com.collabora.collaboraoffice.kde</id> - <extends>libreoffice-base.desktop</extends> - <extends>libreoffice-calc.desktop</extends> - <extends>libreoffice-draw.desktop</extends> - <extends>libreoffice-impress.desktop</extends> - <extends>libreoffice-writer.desktop</extends> + <extends>collaboraoffice-base.desktop</extends> + <extends>collaboraoffice-calc.desktop</extends> + <extends>collaboraoffice-draw.desktop</extends> + <extends>collaboraoffice-impress.desktop</extends> + <extends>collaboraoffice-writer.desktop</extends> <metadata_license>CC0-1.0</metadata_license> <project_license>MPL-2.0</project_license> - <name>LibreOffice KDE Integration</name> - <summary>Improves LibreOffice integration within the KDE Plasma desktop environment</summary> + <name>Collabora Office KDE Integration</name> + <summary>Improves Collabora Office integration within the KDE Plasma desktop environment</summary> - <url type="homepage">http://www.libreoffice.org/discover/writer/</url> - <url type="bugtracker">https://bugs.documentfoundation.org/</url> - <url type="donation">https://donate.libreoffice.org/</url> - <url type="faq">https://hub.libreoffice.org/faq</url> - <url type="help">http://www.libreoffice.org/get-help/documentation/</url> - <url type="translate">https://hub.libreoffice.org/translate</url> + <url type="homepage">https://collabora.com</url> <compulsory_for_desktop>KDE</compulsory_for_desktop> <compulsory_for_desktop>Plasma</compulsory_for_desktop> - <developer_name>The Document Foundation</developer_name> - <update_contact>libreoffice_at_lists.freedesktop.org</update_contact> + <developer_name>Collabora Limited</developer_name> </component> diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 159a64093113..5aa1e00175ad 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -60,5 +60,5 @@ mkdir -p "${DESTDIR}/${PREFIXDIR}/share/metainfo" for i in base calc draw impress writer; do cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/${PREFIXDIR}/share/metainfo/${PREFIX}-${i}.appdata.xml" done -cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIXDIR}/share/metainfo/org.${PREFIX}.kde.metainfo.xml" +cp "${APPDATA_SOURCE_DIR}/org.libreoffice.kde.metainfo.xml" "${DESTDIR}/${PREFIXDIR}/share/metainfo/com.collabora.${PREFIX}.kde.metainfo.xml"
