diff options
Diffstat (limited to 'extra/libreoffice/fix_install.diff')
-rw-r--r-- | extra/libreoffice/fix_install.diff | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/extra/libreoffice/fix_install.diff b/extra/libreoffice/fix_install.diff new file mode 100644 index 000000000..b16320a22 --- /dev/null +++ b/extra/libreoffice/fix_install.diff @@ -0,0 +1,82 @@ +From 8ce82f83fb8146b684bec5d903d76f034ba37d4a Mon Sep 17 00:00:00 2001 +From: Petr Mladek <pmladek@suse.cz> +Date: Fri, 07 Jun 2013 12:13:24 +0000 +Subject: distro-install-file-lists: handle new filelists created for 4.1 + +Change-Id: I2d7a52b396a46f1f6546b92eb5612958a2cb7397 +--- +diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists +index d83855b..bbd462b 100755 +--- a/bin/distro-install-file-lists ++++ b/bin/distro-install-file-lists +@@ -80,6 +80,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + gid_Module_Root_Files_[0-9] \ + gid_Module_Root_Hack \ + gid_Module_Oo_Linguistic \ ++ gid_Module_Root_Extension_Dictionary_* \ + gid_Module_Root_Ure_Hidden ; do + merge_flists $module $FILELISTSDIR/common_list.txt + done +@@ -100,6 +101,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/math_list.txt + merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/impress_list.txt + merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/writer_list.txt ++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/base_list.txt ++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/draw_list.txt ++ + # FIXME: small; low dependencies; why optional module? + merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/impress_list.txt + else +@@ -115,6 +119,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Pdfimport $FILELISTSDIR/common_list.txt + # FIXME: small; low dependencies; why optional module? + merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt + fi +@@ -133,26 +139,26 @@ if test "z$OOO_VENDOR" != "zDebian" ; then + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt + else + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt + fi + else + merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt +- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Pyuno $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt +- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/common_list.txt ++ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/common_list.txt + merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt + fi + +@@ -413,7 +419,7 @@ else + create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer + create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress + create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base +- create_package_directory gid_Module_Optional_Pyuno pkg/python-uno ++ create_package_directory gid_Module_Pyuno pkg/python-uno + create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome + create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde + create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde +-- +cgit v0.9.0.2-2-gbebe |