[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-82-g69f611d
The following commit has been merged in the debian-experimental-4.1 branch:
commit ef8d2824a84f6212b0123d4adba2f58acfd84ade
Author: Rene Engelhard <rene@debian.org>
Date: Thu Apr 25 00:12:53 2013 +0200
git update
diff --git a/changelog b/changelog
index 8bffff1..37e3368 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130417-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130424-1) UNRELEASED; urgency=low
* new upstream snapshot
* debian/uno-libs3.symbols: update and cleanup - use (symver) instead
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 9cf1ff6..313ab1e 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -190,7 +190,7 @@ index 4b2c1f0..9423f87 100644
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
hwp \
- lwpft \
+ $(if $(ENABLE_LWP),lwpft) \
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index 225cf94..53ad321 100644
--- a/scp2/InstallModule_base.mk
@@ -211,7 +211,7 @@ index 520a4d9..c826ee7 100644
@@ -118,7 +118,7 @@ endef
define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
- gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
+ gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := OOO URE WRITER BASE
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
diff --git a/patches/py2uno-module.diff b/patches/py2uno-module.diff
index 84c7c22..dd63e11 100644
--- a/patches/py2uno-module.diff
+++ b/patches/py2uno-module.diff
@@ -12,14 +12,14 @@ index 16ef7ba..ea257b1 100755
recentfile \
scriptframe \
sdbc2 \
-@@ -600,6 +602,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
- passwordcontainer \
- pdfimport \
+@@ -576,6 +579,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ mtfrenderer \
+ OGLTrans \
pythonloader \
+ python2loader \
- postgresql-sdbc \
- postgresql-sdbc-impl \
- simplecanvas \
+ slideshow \
+ stringresource \
+ tdebe1 \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 6beb818..1a570e4 100644
--- a/RepositoryFixes.mk
diff --git a/patches/pyuno-copy-for-python2.diff b/patches/pyuno-copy-for-python2.diff
index 057f0b1..f3b1337 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -71,7 +71,7 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+# vim:set noet sw=4 ts=4:
--- /dev/null 2012-11-27 20:03:56.000000000 +0100
+++ py2uno/Library_py2uno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
-@@ -0,0 +1,59 @@
+@@ -0,0 +1,54 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
@@ -100,11 +100,6 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+
+$(eval $(call gb_Library_Library,py2uno_wrapper))
+
-+$(eval $(call gb_Library_use_packages,py2uno_wrapper,\
-+ sal_generated \
-+ sal_odk_headers \
-+))
-+
+$(eval $(call gb_Library_set_include,py2uno_wrapper,\
+ -I$(SRCDIR)/py2uno/source/module \
+ -I$(SRCDIR)/py2uno/inc \
@@ -324,7 +319,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-# vim:set noet sw=4 ts=4:
--- pyuno/Library_pyuno_wrapper.mk 2012-11-27 17:57:31.000000000 +0100
+++ /dev/null 2012-11-27 20:03:56.000000000 +0100
-@@ -1,59 +0,0 @@
+@@ -1,54 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
@@ -353,11 +348,6 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-
-$(eval $(call gb_Library_Library,pyuno_wrapper))
-
--$(eval $(call gb_Library_use_packages,pyuno_wrapper,\
-- sal_generated \
-- sal_odk_headers \
--))
--
-$(eval $(call gb_Library_set_include,pyuno_wrapper,\
- -I$(SRCDIR)/pyuno/source/module \
- -I$(SRCDIR)/pyuno/inc \
@@ -387,7 +377,7 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
--- pyuno/Module_py2uno.mk 1970-01-01 01:00:00.000000000 +0100
+++ py2uno/Module_py2uno.mk 2012-09-17 21:37:10.060921827 +0200
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,82 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
@@ -452,26 +442,12 @@ diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
+ CustomTarget_python_shell \
+ Package_python_shell \
+))
-+ifneq ($(OS),MACOSX)
-+$(eval $(call gb_Module_add_targets,pyuno,\
-+ CustomTarget_python_bin \
-+ Package_python_bin \
-+))
-+endif
-+endif
-+
-+# python-zipcore-$(PYVESION) not on MACOSX
-+# (OOoPython.framework.zip is already delivered for MACOSX in python module)
-+ifneq ($(OS),MACOSX)
-+$(eval $(call gb_Module_add_targets,pyuno,\
-+ CustomTarget_zipcore \
-+ Package_zipcore \
-+))
+endif
+
+else # SYSTEM_PYTHON
+
-+# previous two targets has to be executed also with system-python on mingw
++# these two targets have to be executed only with system-python on mingw
++# FIXME remove this
+ifeq ($(OS)$(COM),WNTGCC)
+$(eval $(call gb_Module_add_targets,pyuno,\
+ CustomTarget_zipcore \
@@ -487,7 +463,7 @@ diff -urN pyuno/Module_py2uno.mk py2uno/Module_py2uno.mk
diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
--- pyuno/Module_pyuno.mk 2012-07-20 11:13:03.401545847 +0200
+++ py2uno/Module_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,96 +0,0 @@
+@@ -1,82 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
@@ -552,26 +528,12 @@ diff -urN pyuno/Module_pyuno.mk py2uno/Module_pyuno.mk
- CustomTarget_python_shell \
- Package_python_shell \
-))
--ifneq ($(OS),MACOSX)
--$(eval $(call gb_Module_add_targets,pyuno,\
-- CustomTarget_python_bin \
-- Package_python_bin \
--))
--endif
--endif
--
--# python-zipcore-$(PYVESION) not on MACOSX
--# (OOoPython.framework.zip is already delivered for MACOSX in python module)
--ifneq ($(OS),MACOSX)
--$(eval $(call gb_Module_add_targets,pyuno,\
-- CustomTarget_zipcore \
-- Package_zipcore \
--))
-endif
-
-else # SYSTEM_PYTHON
-
--# previous two targets has to be executed also with system-python on mingw
+-# these two targets have to be executed only with system-python on mingw
+-# FIXME remove this
-ifeq ($(OS)$(COM),WNTGCC)
-$(eval $(call gb_Module_add_targets,pyuno,\
- CustomTarget_zipcore \
--
LibreOffice packaging repository
Reply to: