[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-25-g61fb3ac



The following commit has been merged in the debian-experimental-4.1 branch:
commit 3232f332f77e89a7cafdf46c2a50545a952b36ac
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Mar 6 01:55:31 2013 +0100

    surrender and revert 83b4703137fdf49304e41202cc91a5574b2e53e7 completely - easier

diff --git a/patches/f b/patches/f
new file mode 100644
index 0000000..9d29e06
--- /dev/null
+++ b/patches/f
@@ -0,0 +1,82 @@
+--- /dev/null	2012-07-03 16:36:49.000000000 +0200
++++ scp2/source/python/module_python_mailmerge.ulf	2013-03-06 01:24:33.434256301 +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"
+--- /dev/null	2012-07-03 16:36:49.000000000 +0200
++++ scp2/source/python/module_python_mailmerge.scp	2013-03-06 01:24:33.434256301 +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
+diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
+index 8b8af48..32de74e 100644
+--- a/scp2/InstallModule_python.mk
++++ b/scp2/InstallModule_python.mk
+@@ -61,7 +61,9 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/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/patches/install-fixes.diff b/patches/install-fixes.diff
index 6bc08ff..7a4077a 100644
--- a/patches/install-fixes.diff
+++ b/patches/install-fixes.diff
@@ -165,160 +165,3 @@ 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"
diff --git a/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff b/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
new file mode 100644
index 0000000..cc5a7d6
--- /dev/null
+++ b/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
@@ -0,0 +1,283 @@
+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.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..629a864 100644
+--- a/scp2/source/python/module_python.scp
++++ b/scp2/source/python/module_python.scp
+@@ -29,9 +29,11 @@
+ 
+ #ifndef DISABLE_PYUNO
+ 
+-Module gid_Module_Pyuno
+-    MOD_NAME_DESC(MODULE_PRG_PYUNO);
+-    ParentID = gid_Module_Root_Brand;
++Module gid_Module_Optional_Pyuno
++    PackageInfo = "packinfo_office.txt";
++    MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
++    ParentID = gid_Module_Optional;
++    Sortkey = "750";
+     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
+                  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
+ 
+ #endif
+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"
diff --git a/patches/series b/patches/series
index 9222698..66f99c1 100644
--- a/patches/series
+++ b/patches/series
@@ -25,3 +25,4 @@ build-dont-run-checks.diff
 disable-flaky-unoapi-tests.diff
 dont-touch-urd.diff
 wheezy-backports-python.diff
+revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff  
diff --git a/scripts/gid2pkgdirs.sh b/scripts/gid2pkgdirs.sh
index 73850af..82bda72 100755
--- a/scripts/gid2pkgdirs.sh
+++ b/scripts/gid2pkgdirs.sh
@@ -96,7 +96,7 @@ create_package_directory gid_Module_Brand_Prg_Draw              pkg/libreoffice-
 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_Pyuno              pkg/python3-uno
+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_Optional_Gnome              pkg/libreoffice-gnome

-- 
LibreOffice packaging repository


Reply to: