[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-15-g03bedac
The following commit has been merged in the debian-experimental-4.1 branch:
commit 03bedacb8a58e9269dfa43b6940461fbe16d7c71
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 5 23:37:23 2013 +0100
partly revert upstreams 83b4703137fdf49304e41202cc91a5574b2e53e7
diff --git a/patches/install-fixes.diff b/patches/install-fixes.diff
index 7a4077a..6bc08ff 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -165,3 +165,160 @@ index eaabf9c..c1b1ec6 100755
fi
# mark the config files
+diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
+index 5f9b410..84d90af 100644
+--- a/scp2/source/extensions/file_extensions.scp
++++ b/scp2/source/extensions/file_extensions.scp
+@@ -282,4 +282,24 @@ End
+
+ #endif
+
++/* ** Script provider for Python ** */
++
++#ifndef WITHOUT_SCRIPTING_PYTHON
++
++File gid_File_Py_Pythonscript
++ TXT_FILE_BODY;
++ Dir = gid_Brand_Dir_Program;
++ Name = "pythonscript.py";
++ Styles = (PACKED);
++End
++
++File gid_File_Rdb_Scriptproviderforpython
++ TXT_FILE_BODY;
++ Dir = gid_Brand_Dir_Program_Services;
++ Name = "scriptproviderforpython.rdb";
++ Styles = (PACKED);
++End
++
++#endif
++
+ #endif
+diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
+index 84fac6b..54612fb 100644
+--- a/scp2/source/extensions/module_extensions.scp
++++ b/scp2/source/extensions/module_extensions.scp
+@@ -317,4 +317,22 @@ End
+
+ #endif
+
++/* ** Script provider for Python ** */
++
++#ifndef WITHOUT_SCRIPTING_PYTHON
++
++Module gid_Module_Optional_Extensions_Script_Provider_For_Python
++ PackageInfo = "packinfo_extensions.txt";
++ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON);
++ ParentID = gid_Module_Optional_Extensions;
++ Files = (
++ gid_File_Py_Pythonscript,
++ gid_File_Rdb_Scriptproviderforpython );
++ Minimal = NO;
++ Default = YES;
++ Styles = ( );
++End
++
++#endif
++
+ #endif
+diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
+index 61618c0..27bdfc0 100644
+--- a/scp2/source/extensions/module_extensions.ulf
++++ b/scp2/source/extensions/module_extensions.ulf
+@@ -140,3 +140,9 @@ en-US = "Script provider for JavaScript"
+
+ [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+ en-US = "Script provider for JavaScript"
++
++[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
++en-US = "Script provider for Python"
++
++[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
++en-US = "Script provider for Python"
+diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
+index 64c7ed9..5b7896b 100644
+--- a/scp2/source/ooo/file_ooo.scp
++++ b/scp2/source/ooo/file_ooo.scp
+@@ -501,12 +501,6 @@ File gid_File_Wizards_Agenda
+ ARCHIVE_TXT_FILE_BODY;
+ Name = "agenda.zip";
+ End
+-
+-File gid_File_Pymailmerge
+- TXT_FILE_BODY;
+- Dir = gid_Brand_Dir_Program;
+- ARCHIVE_TXT_FILE_BODY;
+- Name = "mailmerge.zip";
+ #endif
+ #endif
+
+diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
+index 3390e67..24119a1 100644
+--- a/scp2/source/python/file_python.scp
++++ b/scp2/source/python/file_python.scp
+@@ -29,20 +29,6 @@
+
+ #ifndef DISABLE_PYUNO
+
+-File gid_File_Py_Pythonscript
+- TXT_FILE_BODY;
+- Dir = gid_Brand_Dir_Program;
+- Name = "pythonscript.py";
+- Styles = (PACKED);
+-End
+-
+-File gid_File_Rdb_Scriptproviderforpython
+- TXT_FILE_BODY;
+- Dir = gid_Brand_Dir_Program_Services;
+- Name = "scriptproviderforpython.rdb";
+- Styles = (PACKED);
+-End
+-
+ File gid_File_Lib_Pyuno
+ LIB_FILE_BODY;
+ #ifdef UNX
+diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
+index 092e338..a2541fb 100644
+--- a/scp2/source/python/module_python.scp
++++ b/scp2/source/python/module_python.scp
+@@ -30,8 +30,9 @@
+ #ifndef DISABLE_PYUNO
+
+ Module gid_Module_Pyuno
++ PackageInfo = "packinfo_office.txt";
+ MOD_NAME_DESC(MODULE_PRG_PYUNO);
+- ParentID = gid_Module_Root_Brand;
++ ParentID = gid_Module_Root;
+ Dirs = (gid_Dir_PythonFramework,
+ gid_Dir_PythonFramework_Versions,
+ gid_Dir_PythonFramework_Versions_ver,
+@@ -52,8 +53,6 @@ Module gid_Module_Pyuno
+ gid_File_Py_Pythonloader,
+ gid_File_Py_Python_Core,
+ gid_File_Py_Python_Bin,
+- gid_File_Py_Pythonscript,
+- gid_File_Rdb_Scriptproviderforpython,
+ gid_File_Lib_Python_So,
+ gid_File_Lib_Python3_So,
+ gid_File_Scripts_Python,
+@@ -78,6 +77,7 @@ Module gid_Module_Pyuno
+ gid_Unixlink_Python_libpython_m_config_a,
+ gid_Unixlink_Python_libpython_m_config_dylib);
+ Styles = (HIDDEN_ROOT);
++ Default = YES;
+ End
+
+ #endif
+diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
+index f67453e..442d0e6 100644
+--- a/setup_native/source/packinfo/packinfo_office.txt
++++ b/setup_native/source/packinfo/packinfo_office.txt
+@@ -282,7 +282,7 @@ packageversion = "%ABOUTBOXPRODUCTVERSION"
+ End
+
+ Start
+-module = "gid_Module_Optional_Pyuno"
++module = "gid_Module_Pyuno"
+ solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno"
+ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, SUNWPython"
+ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno"
--
LibreOffice packaging repository
Reply to: