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 2fefb6c73e4f57a6d3cad21942282ac37131f945 Author: Stephan Bergmann <[email protected]> AuthorDate: Fri Apr 4 14:15:26 2025 +0200 Commit: Stephan Bergmann <[email protected]> CommitDate: Fri Apr 4 15:58:21 2025 +0200 AppStream branding Change-Id: I40fbebc00744ac5248813c3b83c9a6321c7a1cc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183712 Reviewed-by: Stephan Bergmann <[email protected]> Tested-by: allotropia jenkins <[email protected]> diff --git a/solenv/bin/assemble-flatpak-appdata.sh b/solenv/bin/assemble-flatpak-appdata.sh index a4768ac4c536..056234eb2771 100755 --- a/solenv/bin/assemble-flatpak-appdata.sh +++ b/solenv/bin/assemble-flatpak-appdata.sh @@ -42,12 +42,7 @@ cat <<\EOF >"${1?}"de.allotropia.ZetaOffice.appdata.xml without worrying about compatibility.</p> </description> <launchable type="desktop-id">de.allotropia.ZetaOffice.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">http://zetaoffice.net</url> <screenshots> <screenshot type="default"> <image>https://hub.libreoffice.org/screenshots/writer-01.png</image> @@ -70,8 +65,7 @@ cat <<\EOF >"${1?}"de.allotropia.ZetaOffice.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>allotropia Software GmbH</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..3781e993054c 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>zetaoffice-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>ZetaOffice Base</name> + <summary>Database manager part of the ZetaOffice 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 ZetaOffice 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">http://zetaoffice.net</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>allotropia Software GmbH</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..0f0ca1d81e87 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>zetaoffice-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>ZetaOffice Calc</name> + <summary>Spreadsheet program of the ZetaOffice 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 ZetaOffice 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 +ZetaOffice 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">http://zetaoffice.net</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>allotropia Software GmbH</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..fbd6ac02d8fa 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>zetaoffice-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>ZetaOffice Draw</name> + <summary>Graphics editor part of the ZetaOffice productivity suite</summary> <description> <p> -LibreOffice Draw is an easy-to-use graphics editor, which empowers you to create +ZetaOffice 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 +ZetaOffice 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">http://zetaoffice.net</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>allotropia Software GmbH</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..90392fe28fbf 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>zetaoffice-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>ZetaOffice Impress</name> + <summary>Presentation program of the ZetaOffice 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 ZetaOffice 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 +ZetaOffice 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">http://zetaoffice.net</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>allotropia Software GmbH</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..02b05aa88e28 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>zetaoffice-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>ZetaOffice Writer</name> + <summary>Word processor part of the ZetaOffice productivity suite</summary> <description> <p> -Writer is the word processor inside LibreOffice productivity suite. +Writer is the word processor inside ZetaOffice 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 +ZetaOffice 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">http://zetaoffice.net</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>allotropia Software GmbH</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..f419cff2965b 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>de.allotropia.zetaoffice.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>zetaoffice-base.desktop</extends> + <extends>zetaoffice-calc.desktop</extends> + <extends>zetaoffice-draw.desktop</extends> + <extends>zetaoffice-impress.desktop</extends> + <extends>zetaoffice-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>ZetaOffice KDE Integration</name> + <summary>Improves ZetaOffice 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">http://zetaoffice.net</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>allotropia Software GmbH</developer_name> </component> diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 6d1457ba6a42..d76dd54dafc0 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/de.allotropia.${PREFIX}.kde.metainfo.xml"
