[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - solenv/bin sysui/desktop

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Aug 14 14:35:13 UTC 2018


 solenv/bin/assemble-flatpak.sh                                  |   10 +++++-----
 sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml    |    4 ++--
 sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml    |    6 +++++-
 sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml    |    4 ++--
 sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml |    6 +++++-
 sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml  |    4 ++--
 6 files changed, 21 insertions(+), 13 deletions(-)

New commits:
commit 8f858a06f6bc296f51274b516fe99911f0a55aef
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Apr 12 11:07:43 2018 +0200
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Aug 14 16:34:50 2018 +0200

    tdf#116856 Update screenshot images
    
    Taken from https://www.libreoffice.org/discover/screenshots/
    
    Thanks to guilhem for creating the hub redirection
    
    Change-Id: I57a8fb928e9353d9b305c2e1b09b4f0dd13624f6
    Reviewed-on: https://gerrit.libreoffice.org/52767
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit fa81dd8e34816f8b1d57576f0c7fcbf3c66271e6)
    Reviewed-on: https://gerrit.libreoffice.org/58994
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index 2d988084cb1c..802c61cd8f86 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -103,23 +103,23 @@ cat <<EOF >/app/share/appdata/org.libreoffice.LibreOffice.appdata.xml
  <url type="translate">https://wiki.documentfoundation.org/Translating_LibreOffice</url>
  <screenshots>
   <screenshot type="default">
-   <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-02-Table-of-Contents-Getting-Started-Guide-4-2.png</image>
+   <image>https://hub.libreoffice.org/screenshots/writer-01.png</image>
    <caption><!-- Describe this screenshot in less than ~10 words --></caption>
   </screenshot>
   <screenshot>
-   <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png</image>
+   <image>https://hub.libreoffice.org/screenshots/calc-02.png</image>
    <caption><!-- Describe this screenshot in less than ~10 words --></caption>
   </screenshot>
   <screenshot>
-   <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Impress-01-Blank.png</image>
+   <image>https://hub.libreoffice.org/screenshots/impress-01.png</image>
    <caption><!-- Describe this screenshot in less than ~10 words --></caption>
   </screenshot>
   <screenshot>
-   <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png</image>
+   <image>https://hub.libreoffice.org/screenshots/draw-02.png</image>
    <caption><!-- Describe this screenshot in less than ~10 words --></caption>
   </screenshot>
   <screenshot>
-   <image>http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png</image>
+   <image>https://hub.libreoffice.org/screenshots/base-02.png</image>
    <caption><!-- Describe this screenshot in less than ~10 words --></caption>
   </screenshot>
  </screenshots>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
index d8398fbd839d..4ccbe7be47d5 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -33,11 +33,11 @@ to connect to virtually any other existing database engine as well.
   <url type="translate">https://hub.libreoffice.org/translate</url>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png</image>
+      <image>https://hub.libreoffice.org/screenshots/base-01.png</image>
       <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
     <screenshot>
-      <image>http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-80.png</image>
+      <image>https://hub.libreoffice.org/screenshots/base-02.png</image>
       <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
   </screenshots>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
index b74064327d4e..6753773bcccb 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
@@ -27,7 +27,11 @@ worrying about compatibility.
   <url type="translate">https://hub.libreoffice.org/translate</url>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png</image>
+      <image>https://hub.libreoffice.org/screenshots/calc-01.png</image>
+      <caption><!-- Describe this screenshot in less than ~10 words --></caption>
+    </screenshot>
+    <screenshot>
+      <image>https://hub.libreoffice.org/screenshots/calc-02.png</image>
       <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
   </screenshots>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
index 5fd7136aec26..3655e959cbc0 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
@@ -32,11 +32,11 @@ worrying about compatibility.
   <url type="translate">https://hub.libreoffice.org/translate</url>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png</image>
+      <image>https://hub.libreoffice.org/screenshots/draw-01.png</image>
       <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
     <screenshot>
-      <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-03-Square-fdo75097.png</image>
+      <image>https://hub.libreoffice.org/screenshots/draw-02.png</image>
       <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
   </screenshots>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
index ee0b66cff146..23fdc1154e0e 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
@@ -28,7 +28,11 @@ worrying about compatibility.
   <url type="translate">https://hub.libreoffice.org/translate</url>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Impress-01-Blank.png</image>
+      <image>https://hub.libreoffice.org/screenshots/impress-01.png</image>
+      <caption><!-- Describe this screenshot in less than ~10 words --></caption>
+    </screenshot>
+    <screenshot>
+      <image>https://hub.libreoffice.org/screenshots/impress-02.png</image>
       <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
   </screenshots>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
index 134ef74037e3..df0ce289a839 100644
--- a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
+++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
@@ -34,11 +34,11 @@ worrying about compatibility.
   <url type="translate">https://hub.libreoffice.org/translate</url>
   <screenshots>
     <screenshot type="default">
-      <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-02-Table-of-Contents-Getting-Started-Guide-4-2.png</image>
+      <image>https://hub.libreoffice.org/screenshots/writer-01.png</image>
       <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
     <screenshot>
-      <image>http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-03-Technical-Doc-fdo83524.png</image>
+      <image>https://hub.libreoffice.org/screenshots/writer-02.png</image>
       <caption><!-- Describe this screenshot in less than ~10 words --></caption>
     </screenshot>
   </screenshots>


More information about the Libreoffice-commits mailing list