[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 3 commits - bin/distro-install-desktop-integration configure.in
Michael Meeks
michael at kemper.freedesktop.org
Tue Jul 19 05:56:09 PDT 2011
bin/distro-install-desktop-integration | 3 ++-
configure.in | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 8d956763258c0f084327bfe8c2b8d5f4950283d0
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
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 3e64a54568e5c1be615a53e23710e700033f8966
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
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 67fe6db50e01f0e3686fb4914961b944670eab4e
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
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"
More information about the Libreoffice-commits
mailing list