[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3_rc1-3-96-g3b2da8f
The following commit has been merged in the debian-experimental-4.1 branch:
commit 81a4f37f7f448aa037757e9c05f194b10a8ec210
Author: Rene Engelhard <rene@debian.org>
Date: Tue Apr 30 07:04:34 2013 +0200
git update; fix up PYHTON_FOR_BUILD and ignore test failure on wheezy-backports...
diff --git a/changelog b/changelog
index a653828..e7a82c9 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130424-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130429-1) UNRELEASED; urgency=low
* new upstream snapshot
* debian/uno-libs3.symbols: update and cleanup - use (symver) instead
diff --git a/control.in b/control.in
index 609b712..9ce3c42 100644
--- a/control.in
+++ b/control.in
@@ -583,6 +583,7 @@ Description: Python-UNO bridge (support for old python 2)
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: python3.3-uno
+#Provides: ${python3:Provides}
Section: python
Architecture: %OOO_ARCHS%
Enhances: libreoffice
diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index bc67685..216fc47 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -23,10 +23,10 @@
export CURL=@CURL@
export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
-index b0b6f92..530267b 100644
+index c71cb40..f826d65 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
-@@ -276,6 +276,8 @@ gb_GLOBALDEFS += \
+@@ -273,8 +273,10 @@ gb_GLOBALDEFS += \
ENABLE_READONLY_INSTALLSET \
)
@@ -34,4 +34,6 @@ index b0b6f92..530267b 100644
+
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
+ gb_RUNNABLE_INSTDIR :=
+
include $(GBUILDDIR)/Deliver.mk
diff --git a/patches/jdbc-driver-classpaths.diff b/patches/jdbc-driver-classpaths.diff
index 8fc7404..1887772 100644
--- a/patches/jdbc-driver-classpaths.diff
+++ b/patches/jdbc-driver-classpaths.diff
@@ -2,29 +2,29 @@ diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/offi
index 9be30a2..59c87cb 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
-@@ -141,6 +141,25 @@
+@@ -147,6 +147,25 @@
</node>
</node>
</node>
+ <node oor:name="JDBC">
+ <node oor:name="DriverClassPaths">
-+ <node oor:name="com.mysql.jdbc.Driver" oor:op="replace">
-+ <prop oor:name="Path">
-+ <value>file:///usr/share/java/mysql.jar</value>
-+ </prop>
-+ </node>
-+ <node oor:name="org.postgresql.Driver" oor:op="replace">
-+ <prop oor:name="Path">
-+ <value>file:///usr/share/java/posgresql.jar</value>
-+ </prop>
-+ </node>
-+ <node oor:name="net.sourceforge.jtds.jdbc.Driver" oor:op="replace">
-+ <prop oor:name="Path">
-+ <value>file:///usr/share/java/jtds.jar</value>
-+ </prop>
-+ </node>
++ <node oor:name="com.mysql.jdbc.Driver" oor:op="replace">
++ <prop oor:name="Path">
++ <value>file:///usr/share/java/mysql.jar</value>
++ </prop>
++ </node>
++ <node oor:name="org.postgresql.Driver" oor:op="replace">
++ <prop oor:name="Path">
++ <value>file:///usr/share/java/posgresql.jar</value>
++ </prop>
++ </node>
++ <node oor:name="net.sourceforge.jtds.jdbc.Driver" oor:op="replace">
++ <prop oor:name="Path">
++ <value>file:///usr/share/java/jtds.jar</value>
++ </prop>
++ </node>
+ </node>
+ </node>
<node oor:name="RegisteredNames">
<node oor:name="EvolutionLocal" oor:op="replace" install:module="evoab2">
- <prop oor:name="Location" oor:type="xs:string">
+ <prop oor:name="Location" oor:type="xs:string">
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 313ab1e..c034f50 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -51,7 +51,7 @@ index b5bec12..920fc4e 100644
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (gid_File_Extra_Urldesktop_Draw,gid_File_Extra_Urlnew_Draw,gid_File_Extra_Urlstart_Draw,gid_File_Extra_Urltasks_Draw,
-+ gid_File_Filter_Sdfilt,
++ auto_Draw_Lib_ALL
+ gid_File_Lib_Sd,
+ gid_File_Lib_Sdd,
+ gid_File_Lib_Sdui,
@@ -115,14 +115,6 @@ index ed7729e..5a03e3d 100644
gid_File_Bin_Open_Url,
gid_File_Bin_Pluginapp,
gid_File_Bin_Senddoc,
-@@ -158,7 +157,6 @@ Module gid_Module_Root_Files_4
- Files = (gid_File_Dat_Root4,
- auto_File_Lib_ALL
- gid_File_Filter_Eme,
-- gid_File_Filter_Sdfilt,
- gid_File_Filter_Icg,
- gid_File_Filter_Egi,
- gid_File_Filter_Epb,
@@ -191,9 +189,6 @@ Module gid_Module_Root_Files_4
gid_File_Lib_Sf_Prothdlr,
gid_File_Lib_Res,
@@ -178,7 +170,15 @@ index 4b2c1f0..9423f87 100644
deploymentmisc \
$(if $(filter unx,$(GUIBASE)),desktop_detector) \
drawinglayer \
-@@ -274,6 +271,12 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+@@ -277,7 +274,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+ sax \
+ sb \
+ sdbt \
+- sdfilt \
+ sfx \
+ sot \
+ $(if $(ENABLE_HEADLESS),,spl) \
+@@ -274,6 +271,16 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
xo \
))
@@ -188,6 +188,10 @@ index 4b2c1f0..9423f87 100644
+ dbaxml \
+))
+
++$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,DRAW, \
++ sdfilt \
++))
++
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
hwp \
$(if $(ENABLE_LWP),lwpft) \
@@ -204,6 +208,19 @@ index 225cf94..53ad321 100644
# Not sure about that?
#$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
# ENABLE_REPORTBUILDER \
+diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk
+index 63a29f8..d5bbf6c 100644
+--- a/scp2/InstallModule_draw.mk
++++ b/scp2/InstallModule_draw.mk
+@@ -9,6 +9,8 @@
+
+ $(eval $(call gb_InstallModule_InstallModule,scp2/draw))
+
++$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/draw,draw))
++
+ $(eval $(call gb_InstallModule_add_templates,scp2/draw,\
+ scp2/source/templates/module_langpack_draw \
+ ))
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 520a4d9..c826ee7 100644
--- a/solenv/gbuild/Helper.mk
@@ -213,7 +230,7 @@ index 520a4d9..c826ee7 100644
gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
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_Library_VALIDINSTALLMODULES := OOO URE WRITER BASE DRAW
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT
@@ -232,15 +249,31 @@ index 520a4d9..c826ee7 100644
+$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
+
+# vim: set noet sw=4 ts=4:
+--- /dev/null 2012-07-03 16:36:49.000000000 +0200
++++ b/scp2/AutoInstallLibs_draw.mk 2013-04-15 18:21:21.695428073 +0200
+@@ -0,0 +1,12 @@
++# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
++#
++# 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/.
++#
++
++$(eval $(call gb_AutoInstallLibs_AutoInstallLibs,draw,DRAW,LIBO_LIB_FILE,auto_Draw_Lib))
++
++# vim: set noet sw=4 ts=4:
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 9d856d7..dad7605 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
-@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,scp2))
+@@ -30,6 +30,8 @@ $(eval $(call gb_Module_Module,scp2))
$(eval $(call gb_Module_add_targets,scp2,\
AutoInstallLibs_ooo \
AutoInstallLibs_ure \
+ AutoInstallLibs_base \
++ AutoInstallLibs_draw \
AutoInstallLibs_writer \
CustomTarget_langmacros \
InstallModule_accessories \
diff --git a/patches/py2uno-module.diff b/patches/py2uno-module.diff
index dd63e11..e96933e 100644
--- a/patches/py2uno-module.diff
+++ b/patches/py2uno-module.diff
@@ -12,14 +12,14 @@ index 16ef7ba..ea257b1 100755
recentfile \
scriptframe \
sdbc2 \
-@@ -576,6 +579,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
- mtfrenderer \
- OGLTrans \
+@@ -609,6 +609,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
+ postgresql-sdbc \
+ postgresql-sdbc-impl \
pythonloader \
+ python2loader \
+ simplecanvas \
slideshow \
stringresource \
- tdebe1 \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 6beb818..1a570e4 100644
--- a/RepositoryFixes.mk
diff --git a/patches/sensible-lomua.diff b/patches/sensible-lomua.diff
index c4a60cb..3a54a3a 100644
--- a/patches/sensible-lomua.diff
+++ b/patches/sensible-lomua.diff
@@ -2,12 +2,11 @@ Index: libreoffice-3.6.2~rc1/officecfg/registry/data/org/openoffice/Office/Commo
===================================================================
--- libreoffice-3.6.2~rc1.orig/officecfg/registry/data/org/openoffice/Office/Common.xcu 2012-10-07 21:03:17.662850386 -0400
+++ libreoffice-3.6.2~rc1/officecfg/registry/data/org/openoffice/Office/Common.xcu 2012-10-07 21:03:57.174850591 -0400
-@@ -665,8 +665,7 @@
+@@ -655,7 +655,7 @@
</node>
<node oor:name="ExternalMailer" install:module="unixdesktop">
<prop oor:name="Program">
-- <value oor:external=
-- "com.sun.star.configuration.backend.DesktopBackend ExternalMailer"/>
+- <value oor:external="com.sun.star.configuration.backend.DesktopBackend ExternalMailer"/>
+ <value>sensible-lomua</value>
</prop>
</node>
diff --git a/patches/wheezy-backports-python.diff b/patches/wheezy-backports-python.diff
index f4f6e1b..9302c8c 100644
--- a/patches/wheezy-backports-python.diff
+++ b/patches/wheezy-backports-python.diff
@@ -20,3 +20,15 @@ index 0241d92..7e521ee 100644
python_include=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'));"`
python_version=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('VERSION'));"`
python_libs=`$PYTHON -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBS'));"`
+diff --git a/unotest/source/python/org/libreoffice/unotest.py b/unotest/source/python/org/libreoffice/unotest.py
+index 3ec016a..1df20f1 100644
+--- a/unotest/source/python/org/libreoffice/unotest.py
++++ b/unotest/source/python/org/libreoffice/unotest.py
+@@ -7,6 +7,7 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ #
+
++from __future__ import print_function
+ import subprocess
+ import time
+ import uuid
diff --git a/rules b/rules
index 0df2d4a..48dc8ad 100755
--- a/rules
+++ b/rules
@@ -432,6 +432,10 @@ IGNORE_MAKE_CHECK_FAILURES:=
IGNORE_MAKE_CHECK_FAILURES:=
endif
endif
+# sw_python would fail anyways as it doesn't work with python2..
+ifeq "$(WHEEZY_BACKPORT)" "y"
+IGNORE_MAKE_CHECK_FAILURES=-
+endif
OOO_64BIT_ARCHS = $(filter amd64 ia64 kfreebsd-amd64 ppc64 s390x, $(OOO_ARCHS))
@@ -1692,6 +1696,12 @@ $(STAMP_DIR)/build-arch:
--disable-report-builder --disable-scripting-javascript \
--disable-scripting-beanshell
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ # setting PYTHON_FOR_BUILD above does NOT work and otherwise it
+ # might pick up /usr/bin/python (python 2!) which will not work.
+ perl -pi -e 's/export PYTHON_FOR_BUILD=.*/export PYTHON_FOR_BUILD=$(PYTHON)/' config_host.mk
+endif
+
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
ifneq "$(WHEEZY_BACKPORT)" "y"
@@ -1736,6 +1746,12 @@ $(STAMP_DIR)/build-indep:
MARIADBCONFIG=$(MARIADBCONFIG) \
./autogen.sh $(CONFIGURE_FLAGS) --with-help $(CONFIGURE_FLAGS_LANG)
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ # setting PYTHON_FOR_BUILD above does NOT work and otherwise it
+ # might pick up /usr/bin/python (python 2!) which will not work.
+ perl -pi -e 's/export PYTHON_FOR_BUILD=.*/export PYTHON_FOR_BUILD=$(PYTHON)/' config_host.mk
+endif
+
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
touch $@
--
LibreOffice packaging repository
Reply to: