[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 3b2da8fefbd280a70c52f97b08db11edb44da948
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 2 23:24:39 2013 +0200
git update; add conditional for libodfgen
diff --git a/changelog b/changelog
index 6ee051f..a469f3b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130429-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130502-1) UNRELEASED; urgency=low
* new upstream snapshot
* debian/uno-libs3.symbols: update and cleanup - use (symver) instead
diff --git a/control b/control
index d6bca1b..6977198 100644
--- a/control
+++ b/control
@@ -68,6 +68,7 @@ Build-Depends: ant (>= 1.7.0),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libodfgen-dev,
liborbit2-dev,
liborcus-dev (>= 0.5.0),
libpng12-dev,
@@ -1337,6 +1338,7 @@ Depends: ant (>= 1.7.0),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
+ libodfgen-dev,
liborbit2-dev,
liborcus-dev (>= 0.5.0),
libpentaho-reporting-flow-engine-java (>= 0.9.4),
diff --git a/patches/debian-hardened-buildflags-CPPFLAGS.diff b/patches/debian-hardened-buildflags-CPPFLAGS.diff
index 216fc47..17bb219 100644
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@ -26,7 +26,7 @@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c71cb40..f826d65 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
-@@ -273,8 +273,10 @@ gb_GLOBALDEFS += \
+@@ -273,6 +273,8 @@ gb_GLOBALDEFS += \
ENABLE_READONLY_INSTALLSET \
)
@@ -34,6 +34,4 @@ index c71cb40..f826d65 100644
+
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
- gb_RUNNABLE_INSTDIR :=
-
- include $(GBUILDDIR)/Deliver.mk
+ ifeq ($(origin gb_RUNNABLE_INSTDIR),undefined)
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index c034f50..550c7c4 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -158,8 +158,8 @@ diff --git a/Repository.mk b/Repository.mk
index 4b2c1f0..9423f87 100644
--- a/Repository.mk
+++ b/Repository.mk
-@@ -227,11 +227,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
- cppcanvas \
+@@ -228,11 +228,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
+ configmgr \
ctl \
cui \
- dba \
@@ -167,9 +167,9 @@ index 4b2c1f0..9423f87 100644
dbmm \
$(if $(DISABLE_DBCONNECTIVITY),,dbtools) \
- dbaxml \
- deploymentmisc \
- $(if $(filter unx,$(GUIBASE)),desktop_detector) \
- drawinglayer \
+ deploymentmisc \
+ $(if $(filter-out MACOSX WNT,$(OS)),desktopbe1) \
+ $(if $(filter unx,$(GUIBASE)),desktop_detector) \
@@ -277,7 +274,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \
sax \
sb \
@@ -222,17 +222,17 @@ index 63a29f8..d5bbf6c 100644
scp2/source/templates/module_langpack_draw \
))
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
-index 520a4d9..c826ee7 100644
+index 3130bf7..08c2814 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -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 RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS
+ gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := OOO URE WRITER BASE DRAW
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
- gb_Jar_VALIDGROUPS := URE OOO OXT
+ gb_Jar_VALIDGROUPS := URE OOO OXT NONE
--- /dev/null 2012-07-03 16:36:49.000000000 +0200
+++ b/scp2/AutoInstallLibs_base.mk 2013-04-15 18:21:21.695428073 +0200
diff --git a/patches/pyuno-copy-for-python2.diff b/patches/pyuno-copy-for-python2.diff
index f3b1337..e57fabf 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -1,32 +1,15 @@
diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
--- pyuno/Library_py2uno.mk 1970-01-01 01:00:00.000000000 +0100
+++ py2uno/Library_py2uno.mk 2012-09-17 21:35:21.284382442 +0200
-@@ -0,0 +1,67 @@
+@@ -0,0 +1,50 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License or as specified alternatively below. You may obtain a copy of
-+# the License at http://www.mozilla.org/MPL/
++# This file is part of the LibreOffice project.
+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
++# 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/.
+#
-+# Major Contributor(s):
-+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
-+#
-+# All Rights Reserved.
-+#
-+# For minor contributions see the git repository.
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-+# instead of those above.
+
+$(eval $(call gb_Library_Library,py2uno))
+
@@ -71,32 +54,15 @@ 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,54 @@
+@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License or as specified alternatively below. You may obtain a copy of
-+# the License at http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# Major Contributor(s):
-+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
+#
-+# All Rights Reserved.
++# This file is part of the LibreOffice project.
+#
-+# For minor contributions see the git repository.
++# 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/.
+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-+# instead of those above.
+
+$(eval $(call gb_Library_Library,py2uno_wrapper))
+
@@ -129,32 +95,15 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
diff -urN pyuno/Library_python2loader.mk py2uno/Library_python2loader.mk
--- pyuno/Library_python2loader.mk 1970-01-01 01:00:00.000000000 +0100
+++ py2uno/Library_python2loader.mk 2012-09-17 21:36:02.252585588 +0200
-@@ -0,0 +1,56 @@
+@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License or as specified alternatively below. You may obtain a copy of
-+# the License at http://www.mozilla.org/MPL/
++# This file is part of the LibreOffice project.
+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
++# 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/.
+#
-+# Major Contributor(s):
-+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
-+#
-+# All Rights Reserved.
-+#
-+# For minor contributions see the git repository.
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-+# instead of those above.
+
+$(eval $(call gb_Library_Library,python2loader))
+
@@ -189,32 +138,15 @@ diff -urN pyuno/Library_python2loader.mk py2uno/Library_python2loader.mk
diff -urN pyuno/Library_pythonloader.mk py2uno/Library_pythonloader.mk
--- pyuno/Library_pythonloader.mk 2012-06-18 20:36:22.723886656 +0200
+++ py2uno/Library_pythonloader.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,56 +0,0 @@
+@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
--# Version: MPL 1.1 / GPLv3+ / LGPLv3+
--#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License or as specified alternatively below. You may obtain a copy of
--# the License at http://www.mozilla.org/MPL/
--#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
--#
--# Major Contributor(s):
--# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
-#
--# All Rights Reserved.
+-# This file is part of the LibreOffice project.
-#
--# For minor contributions see the git repository.
+-# 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/.
-#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
--# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
--# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
--# instead of those above.
-
-$(eval $(call gb_Library_Library,pythonloader))
-
@@ -249,32 +181,15 @@ diff -urN pyuno/Library_pythonloader.mk py2uno/Library_pythonloader.mk
diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
--- pyuno/Library_pyuno.mk 2012-06-18 20:36:23.391889962 +0200
+++ py2uno/Library_pyuno.mk 1970-01-01 01:00:00.000000000 +0100
-@@ -1,67 +0,0 @@
+@@ -1,50 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
--# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License or as specified alternatively below. You may obtain a copy of
--# the License at http://www.mozilla.org/MPL/
+-# This file is part of the LibreOffice project.
-#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
+-# 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/.
-#
--# Major Contributor(s):
--# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
--#
--# All Rights Reserved.
--#
--# For minor contributions see the git repository.
--#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
--# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
--# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
--# instead of those above.
-
-$(eval $(call gb_Library_Library,pyuno))
-
@@ -319,32 +234,15 @@ 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,54 +0,0 @@
+@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
--# Version: MPL 1.1 / GPLv3+ / LGPLv3+
--#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License or as specified alternatively below. You may obtain a copy of
--# the License at http://www.mozilla.org/MPL/
--#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
--#
--# Major Contributor(s):
--# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
-#
--# All Rights Reserved.
+-# This file is part of the LibreOffice project.
-#
--# For minor contributions see the git repository.
+-# 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/.
-#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
--# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
--# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
--# instead of those above.
-
-$(eval $(call gb_Library_Library,pyuno_wrapper))
-
@@ -377,32 +275,15 @@ 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,82 @@
+@@ -0,0 +1,65 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License or as specified alternatively below. You may obtain a copy of
-+# the License at http://www.mozilla.org/MPL/
++# This file is part of the LibreOffice project.
+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
++# 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/.
+#
-+# Major Contributor(s):
-+# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
-+#
-+# All Rights Reserved.
-+#
-+# For minor contributions see the git repository.
-+#
-+# Alternatively, the contents of this file may be used under the terms of
-+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-+# instead of those above.
+
+$(eval $(call gb_Module_Module,py2uno))
+
@@ -463,32 +344,15 @@ 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,82 +0,0 @@
+@@ -1,65 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
--# Version: MPL 1.1 / GPLv3+ / LGPLv3+
--#
--# The contents of this file are subject to the Mozilla Public License Version
--# 1.1 (the "License"); you may not use this file except in compliance with
--# the License or as specified alternatively below. You may obtain a copy of
--# the License at http://www.mozilla.org/MPL/
--#
--# Software distributed under the License is distributed on an "AS IS" basis,
--# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
--# for the specific language governing rights and limitations under the
--# License.
--#
--# Major Contributor(s):
--# Copyright (C) 2012 David Ostrovsky <d.ostrovsky@gmx.de> (initial developer)
-#
--# All Rights Reserved.
+-# This file is part of the LibreOffice project.
-#
--# For minor contributions see the git repository.
+-# 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/.
-#
--# Alternatively, the contents of this file may be used under the terms of
--# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
--# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
--# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
--# instead of those above.
-
-$(eval $(call gb_Module_Module,pyuno))
-
diff --git a/rules b/rules
index 7742b94..832fa32 100755
--- a/rules
+++ b/rules
@@ -190,6 +190,7 @@ SYSTEM_STUFF += libvisio
SYSTEM_STUFF += libcdr
SYSTEM_STUFF += libmspub
SYSTEM_STUFF += libmwaw
+SYSTEM_STUFF += libodfgen
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@ -536,7 +537,7 @@ $(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "wheezy-backports"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub libmwaw libodfgen mdds liblangtag orcus harfbuzz, $(SYSTEM_STUFF))
WHEEZY_BACKPORT=y
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -1015,6 +1016,9 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
ifneq (,$(filter libmwaw, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmwaw-dev
endif
+ ifneq (,$(filter libodfgen, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libodfgen-dev
+ endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcmis-dev (>= 0.3.1)
endif
--
LibreOffice packaging repository
Reply to: