[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-64-g4fea3e0
The following commit has been merged in the debian-experimental-4.1 branch:
commit 4fea3e0f7e94e081869b1b06998937e641ae654b
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 12 00:05:52 2013 +0100
fix gid_Module_Script_Provider_For_Python install
diff --git a/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff b/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
index cc5a7d6..7765b28 100644
--- a/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
+++ b/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
@@ -45,33 +45,6 @@ index 5f9b410..84d90af 100644
+#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
@@ -129,7 +102,7 @@ index 3390e67..24119a1 100644
LIB_FILE_BODY;
#ifdef UNX
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
-index 092e338..629a864 100644
+index cae8627..ecedf8c 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -29,9 +29,11 @@
@@ -147,16 +120,7 @@ index 092e338..629a864 100644
Dirs = (gid_Dir_PythonFramework,
gid_Dir_PythonFramework_Versions,
gid_Dir_PythonFramework_Versions_ver,
-@@ -52,8 +54,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,
-@@ -77,7 +77,9 @@ Module gid_Module_Pyuno
+@@ -75,7 +77,9 @@ Module gid_Module_Pyuno
gid_Unixlink_Python_libpython_config_dylib,
gid_Unixlink_Python_libpython_m_config_a,
gid_Unixlink_Python_libpython_m_config_dylib);
@@ -166,7 +130,7 @@ index 092e338..629a864 100644
+ Styles = ( );
End
- #endif
+ Module gid_Module_Script_Provider_For_Python
diff --git a/scp2/source/python/module_python_librelogo.scp b/scp2/source/python/module_python_librelogo.scp
index dac4a9c..63982cb 100644
--- a/scp2/source/python/module_python_librelogo.scp
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 82bda72..bc168fb 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -98,7 +98,7 @@ create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-
create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base
create_package_directory gid_Module_Optional_Pyuno pkg/python3-uno
create_package_directory gid_Module_Optional_Pyuno_LibreLogo pkg/libreoffice-librelogo
-create_package_directory gid_Module_Optional_Extensions_Script_Provider_For_Python pkg/libreoffice-script-provider-python
+create_package_directory gid_Module_Script_Provider_For_Python pkg/libreoffice-script-provider-python
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
create_package_directory gid_Module_Root_Files_2 pkg/libreoffice-common
--
LibreOffice packaging repository
Reply to: