[Libreoffice-commits] .: Branch 'libreoffice-3-4-2' - 4 commits - bin/distro-install-desktop-integration configure.in

[Petr Mladek]

 bin/distro-install-desktop-integration |    7 ++++---
 configure.in                           |    3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 484ca7e01dc2467f2232010b916c2392f0407c3e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 18 19:47:39 2011 +0200

    distro-install-desktop-integration: put $PREFIXDIR/bin/soffice into file list
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Andreas Radke <a.radke at arcor.de>
    Signed-off-by: Fridrich Strba <fridrich.strba at bluewin.ch>

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 9e3b499..77ccf3a 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -161,6 +161,7 @@ add_wrapper unopkg         unopkg  ""            "unopkg"      ""
 #       For example, the Novell package mark this symlink as %ghost
 #	and update it in %post and %postun
 ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
+test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand
 
 # create bash completion
 mkdir -p $DESTDIR/etc/bash_completion.d
commit 538fed7081e0e4efbe6ba622e1e9721450ce608b
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 18 16:50:18 2011 +0200

    distro-install: fix en-US-only installation
    
    generate en-US file list when --with-distro=""
    
    sigh, we should set WITH_LANG=en-US when no language is selected; the empty
    string is pretty ugly; unforrunately, many makefile tests check for
    this empty variable
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Andreas Radke <a.radke at arcor.de>
    Signed-off-by: Fridrich Strba <fridrich.strba at bluewin.ch>

diff --git a/configure.in b/configure.in
index 18f93d2..65813cb 100755
--- a/configure.in
+++ b/configure.in
@@ -7906,6 +7906,9 @@ for lang in $WITH_LANG ; do
 done
 # list with substituted ALL
 WITH_LANG_LIST=`echo $WITH_LANG | sed "s/ALL/$ALL_LANGS/"`
+# this variable is used only by bin/distro-install-* helper scripts
+# they need a real list of languages
+test -z "$WITH_LANG_LIST" && WITH_LANG_LIST="en-US"
 AC_SUBST(ALL_LANGS)
 AC_SUBST(WITH_LANG)
 AC_SUBST(WITH_LANG_LIST)
commit e4fec4b6a38612843353c7dbca137aaeb527a646
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 18 16:48:49 2011 +0200

    distro-install-desktop-integration: do not pack libreoffice-base.desktop twice
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Andreas Radke <a.radke at arcor.de>
    Signed-off-by: Fridrich Strba <fridrich.strba at bluewin.ch>

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 600c54e..9e3b499 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -148,7 +148,7 @@ add_wrapper lomath         soffice "--math"       "libreoffice" "libreoffice-mat
 add_wrapper loimpress      soffice "--impress"    "libreoffice" "libreoffice-impress.desktop"     "gid_Module_Brand_Prg_Impress"
 add_wrapper loweb          soffice "--web"        "libreoffice" ""                                "gid_Module_Brand_Prg_Wrt"
 add_wrapper lowriter       soffice "--writer"     "libreoffice" "libreoffice-writer.desktop"      "gid_Module_Brand_Prg_Wrt"
-add_wrapper lofromtemplate soffice ".uno:NewDoc" "libreoffice" "libreoffice-base.desktop"        "gid_Module_Root_Brand"
+add_wrapper lofromtemplate soffice ".uno:NewDoc"  "libreoffice" ""                                "gid_Module_Root_Brand"
 add_wrapper libreoffice    soffice ""            "libreoffice" "libreoffice-startcenter.desktop" "gid_Module_Root_Brand"
 add_wrapper loffice        soffice ""            "libreoffice" ""                                "gid_Module_Root_Brand"
 add_wrapper unopkg         unopkg  ""            "unopkg"      ""                                "gid_Module_Root_Brand"
commit d0a8e6429e2596dabc00b4a18ba0ea5139541c58
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 18 12:32:57 2011 +0200

    distro-install-desktop-integration: work with normal user
    
    + alllow to overwrite the readonly desktop files
    + create the compat soffice symlink in DESTDIR
    
    Signed-off-by: Michael Meeks <michael.meeks at novell.com>
    Signed-off-by: Andreas Radke <a.radke at arcor.de>
    Signed-off-by: Fridrich Strba <fridrich.strba at bluewin.ch>

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index c00c8c6..600c54e 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -123,7 +123,7 @@ for file in *.desktop ; do
         -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
         -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
         "$file" >"$file.new"
-    mv "$file.new" "$file"
+    mv -f "$file.new" "$file"
 done
 cd -
 
@@ -160,7 +160,7 @@ add_wrapper unopkg         unopkg  ""            "unopkg"      ""
 #       you cannot include this link directly into the package
 #       For example, the Novell package mark this symlink as %ghost
 #	and update it in %post and %postun
-ln -sf $INSTALLDIR/program/soffice $PREFIXDIR/bin/soffice
+ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
 
 # create bash completion
 mkdir -p $DESTDIR/etc/bash_completion.d