Hi, the below patches should fix two more problems reported by Andy. I would like to get them into libreoffice-3-4-2 branch.
Best Regards, Petr
>From 7b202653f352a6c1bd18066bc71c93b1a5b33c13 Mon Sep 17 00:00:00 2001 From: Petr Mladek <pmla...@suse.cz> Date: Mon, 18 Jul 2011 16:48:49 +0200 Subject: [PATCH 2/3] distro-install-desktop-integration: do not pack libreoffice-base.desktop twice --- bin/distro-install-desktop-integration | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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" -- 1.7.3.4
>From 72d5c4c3f7d2a5d329eb74fa1d1f69c1fb8c15b9 Mon Sep 17 00:00:00 2001 From: Petr Mladek <pmla...@suse.cz> Date: Mon, 18 Jul 2011 16:50:18 +0200 Subject: [PATCH 3/3] 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 --- configure.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) 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) -- 1.7.3.4
_______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
