[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-66-g921125b
The following commit has been merged in the debian-experimental-4.1 branch:
commit 03492d9b533c517bb37665101d2e50b27883fe74
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 12 11:34:53 2013 +0100
git update; remove revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff, not needed anymore
diff --git a/changelog b/changelog
index b700812..04f62b3 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130311-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130312-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff b/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
index 7765b28..221ca77 100644
--- a/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
+++ b/patches/revert-83b4703137fdf49304e41202cc91a5574b2e53e7.diff
@@ -105,16 +105,15 @@ diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_py
index cae8627..ecedf8c 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
-@@ -29,9 +29,11 @@
+@@ -29,9 +29,10 @@
#ifndef DISABLE_PYUNO
-Module gid_Module_Pyuno
-- MOD_NAME_DESC(MODULE_PRG_PYUNO);
+- PackageInfo = "packinfo_office.txt";
- 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,
diff --git a/patches/series b/patches/series
index 66f99c1..9222698 100644
--- a/patches/series
+++ b/patches/series
@@ -25,4 +25,3 @@ 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 bc168fb..0b56556 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_Optional_Pyuno pkg/python3-uno
+create_package_directory gid_Module_Pyuno pkg/python3-uno
create_package_directory gid_Module_Optional_Pyuno_LibreLogo pkg/libreoffice-librelogo
create_package_directory gid_Module_Script_Provider_For_Python pkg/libreoffice-script-provider-python
create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
--
LibreOffice packaging repository
Reply to: