[Libreoffice-commits] core.git: solenv/bin

[Stephan Bergmann]

 solenv/bin/assemble-flatpak.sh |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d7d12bf1ff10570de5f3392058f7f9c2de04c0a2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 14 18:42:03 2017 +0100

    Make sure there is a org.libreoffice.LibreOffice.desktop again in the Flatpak
    
    ...after 1b85d725663a7d7546549e6b78ea43bea1cde7b9 "Include all .desktop files in
    the Flatpak".  org.libreoffice.LibreOffice.appdata.xml references that in its
    
      <id>org.libreoffice.LibreOffice.desktop</id>
    
    which is at least used to find an icon for the AppData (see
    <https://github.com/flathub/org.libreoffice.LibreOffice/issues/1> "No icon shown
    on flathub.org").  On #flatpak it was deemed impossible to change that id to
    point at the the LibreOffice-startcenter.desktop file, so rather change that one
    desktop file's name.
    
    Change-Id: I78c3ae131be213e41cc4fcdeddae1b6c9e6c29df

diff --git a/solenv/bin/assemble-flatpak.sh b/solenv/bin/assemble-flatpak.sh
index d514c3ee41fc..e678b9894b86 100755
--- a/solenv/bin/assemble-flatpak.sh
+++ b/solenv/bin/assemble-flatpak.sh
@@ -24,6 +24,8 @@ do
   -e 's/^Icon=libreoffice-/Icon=org.libreoffice.LibreOffice-/' "$i" \
   >/app/share/applications/org.libreoffice.LibreOffice-"${i#"${PREFIXDIR?}"/share/applications/libreoffice-}"
 done
+mv /app/share/applications/org.libreoffice.LibreOffice-startcenter.desktop \
+ /app/share/applications/org.libreoffice.LibreOffice.desktop
 
 ## icons/hicolor/*/apps/libreoffice-* ->
 ## icons/hicolor/*/apps/org.libreoffice.LibreOffice-*: