[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-67-g66bdfa4
The following commit has been merged in the debian-experimental-4.1 branch:
commit 66bdfa474736120edb825847d82f281aced4e494
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 12 11:48:47 2013 +0100
actually remove revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
diff --git a/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff b/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
deleted file mode 100644
index 221ca77..0000000
--- a/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
+++ /dev/null
@@ -1,246 +0,0 @@
-diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
-index 8b8af48..7153dee 100644
---- a/scp2/InstallModule_python.mk
-+++ b/scp2/InstallModule_python.mk
-@@ -57,11 +57,12 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\
- scp2/source/python/file_python \
- scp2/source/python/file_python_librelogo \
- scp2/source/python/profileitem_python \
-- scp2/source/python/module_python \
- ))
-
- $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\
-+ scp2/source/python/module_python \
- scp2/source/python/module_python_librelogo \
-+ scp2/source/python/module_python_mailmerge \
- ))
-
- # vim: set shiftwidth=4 tabstop=4 noexpandtab:
-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.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 cae8627..ecedf8c 100644
---- a/scp2/source/python/module_python.scp
-+++ b/scp2/source/python/module_python.scp
-@@ -29,9 +29,10 @@
-
- #ifndef DISABLE_PYUNO
-
--Module gid_Module_Pyuno
-- PackageInfo = "packinfo_office.txt";
-- ParentID = gid_Module_Root_Brand;
-+Module gid_Module_Optional_Pyuno
-+ PackageInfo = "packinfo_office.txt";
-+ ParentID = gid_Module_Optional;
-+ Sortkey = "750";
- Dirs = (gid_Dir_PythonFramework,
- gid_Dir_PythonFramework_Versions,
- gid_Dir_PythonFramework_Versions_ver,
-@@ -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);
-- Styles = (HIDDEN_ROOT);
-+ Minimal = NO;
-+ Default = YES;
-+ Styles = ( );
- End
-
- 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
-+++ b/scp2/source/python/module_python_librelogo.scp
-@@ -13,8 +13,8 @@
- Module gid_Module_Optional_Pyuno_LibreLogo
- PackageInfo = "packinfo_office.txt";
- MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON_LIBRELOGO );
-- ParentID = gid_Module_Optional;
-- Sortkey = "810";
-+ ParentID = gid_Module_Optional_Pyuno;
-+ Sortkey = "100";
- Files = (gid_File_LibreLogo,
- gid_File_Share_Registry_LibreLogo_Xcd);
- Minimal = NO;
-diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
-index b14947a..aa14834 100644
---- a/scp2/source/python/profileitem_python.scp
-+++ b/scp2/source/python/profileitem_python.scp
-@@ -30,7 +30,7 @@
- #ifndef DISABLE_PYUNO
-
- Profile gid_Profile_Pythonloader_Uno_Ini
-- ModuleID = gid_Module_Pyuno;
-+ ModuleID = gid_Module_Optional_Pyuno;
- #ifdef UNX
- Name = "pythonloader.unorc";
- #else
-@@ -43,7 +43,7 @@ End
- #ifndef SYSTEM_PYTHON
- ProfileItem gid_Profileitem_Pythonloader_Pythonhome
- ProfileID = gid_Profile_Pythonloader_Uno_Ini;
-- ModuleID = gid_Module_Pyuno;
-+ ModuleID = gid_Module_Optional_Pyuno;
- Section = "Bootstrap";
- Order = 1;
- Key = "PYUNO_LOADER_PYTHONHOME";
-@@ -57,7 +57,7 @@ End
-
- ProfileItem gid_Profileitem_Pythonloader_Pythonpath
- ProfileID = gid_Profile_Pythonloader_Uno_Ini;
-- ModuleID = gid_Module_Pyuno;
-+ ModuleID = gid_Module_Optional_Pyuno;
- Section = "Bootstrap";
- Order = 1;
- Key = "PYUNO_LOADER_PYTHONPATH";
---- /dev/null 2012-07-03 16:36:49.000000000 +0200
-+++ b/scp2/source/python/module_python_mailmerge.scp 2013-03-06 01:50:14.566210766 +0100
-@@ -0,0 +1,39 @@
-+/*************************************************************************
-+ *
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * Copyright 2000, 2010 Oracle and/or its affiliates.
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * This file is part of OpenOffice.org.
-+ *
-+ * OpenOffice.org is free software: you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License version 3
-+ * only, as published by the Free Software Foundation.
-+ *
-+ * OpenOffice.org is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU Lesser General Public License version 3 for more details
-+ * (a copy is included in the LICENSE file that accompanied this code).
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * version 3 along with OpenOffice.org. If not, see
-+ * <http://www.openoffice.org/license.html>
-+ * for a copy of the LGPLv3 License.
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef AIX
-+#ifndef DISABLE_PYUNO
-+File gid_File_Pymailmerge
-+ TXT_FILE_BODY;
-+ Dir = gid_Brand_Dir_Program;
-+ Name = "mailmerge.zip";
-+ Styles = (ARCHIVE);
-+End
-+#endif
-+#endif
---- /dev/null 2012-07-03 16:36:49.000000000 +0200
-+++ b/scp2/source/python/module_python_mailmerge.ulf 2013-03-06 01:50:14.570210767 +0100
-@@ -0,0 +1,23 @@
-+/*
-+ * This file is part of the LibreOffice project.
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
-+ *
-+ * This file incorporates work covered by the following license notice:
-+ *
-+ * Licensed to the Apache Software Foundation (ASF) under one or more
-+ * contributor license agreements. See the NOTICE file distributed
-+ * with this work for additional information regarding copyright
-+ * ownership. The ASF licenses this file to you under the Apache
-+ * License, Version 2.0 (the "License"); you may not use this file
-+ * except in compliance with the License. You may obtain a copy of
-+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
-+ */
-+
-+[STR_NAME_MODULE_OPTIONAL_PYTHON_MAILMERGE]
-+en-US = "E-mail Mailmerge"
-+
-+[STR_DESC_MODULE_OPTIONAL_PYTHON_MAILMERGE]
-+en-US = "Module for %PRODUCTNAME E-mail Mailmerge feature"
--
LibreOffice packaging repository
Reply to: