[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-2-107-g0193c63
The following commit has been merged in the debian-experimental-4.1 branch:
commit 0193c6340a245ba33ae01f38dae6a6632ade9a79
Author: Rene Engelhard <rene@debian.org>
Date: Fri May 10 21:43:54 2013 +0200
git update; we now need mdds >= 0.8.0
diff --git a/changelog b/changelog
index 81b0b30..ff92495 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~beta1~git20130508-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~beta1~git20130510-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/control b/control
index c37a92c..316d55f 100644
--- a/control
+++ b/control
@@ -61,7 +61,7 @@ Build-Depends: ant (>= 1.7.0),
liblcms2-dev,
libldap2-dev,
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.7.1),
+ libmdds-dev (>= 0.8.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
@@ -1332,7 +1332,7 @@ Depends: ant (>= 1.7.0),
libldap2-dev,
libloader-java (>= 1.1.6),
liblpsolve55-dev (>= 5.5.0.13-5+b1),
- libmdds-dev (>= 0.7.1),
+ libmdds-dev (>= 0.8.0),
libmspub-dev,
libmwaw-dev,
libmysqlclient-dev,
diff --git a/patches/make-package-modules-not-suck.diff b/patches/make-package-modules-not-suck.diff
index 062fbaf..ca45691 100644
--- a/patches/make-package-modules-not-suck.diff
+++ b/patches/make-package-modules-not-suck.diff
@@ -274,8 +274,8 @@ index ded46b9..447c331 100644
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 UNOVERLIBS EXTENSIONLIBS
--gb_Library_VALIDINSTALLMODULES := GNOME TDE KDE OOO URE WRITER
-+gb_Library_VALIDINSTALLMODULES := GNOME TDE KDE OOO URE WRITER BASE DRAW IMPRESS
+-gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER
++gb_Library_VALIDINSTALLMODULES := GRAPHICFILTER GNOME TDE KDE OOO URE WRITER BASE DRAW IMPRESS
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
gb_Jar_VALIDGROUPS := URE OOO OXT NONE
diff --git a/patches/pyuno-copy-for-python2.diff b/patches/pyuno-copy-for-python2.diff
index c476693..3d274fc 100644
--- a/patches/pyuno-copy-for-python2.diff
+++ b/patches/pyuno-copy-for-python2.diff
@@ -54,7 +54,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,49 @@
+@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
@@ -89,7 +89,6 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
+$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
+
-+ifneq ($(OS)$(COM),WNTMSC)
+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
+
+$(eval $(call gb_Library_add_libs,py2uno_wrapper,\
@@ -97,7 +96,6 @@ diff -urN pyuno/Library_py2uno.mk py2uno/Library_py2uno.mk
+))
+
+endif
-+endif
+
+$(eval $(call gb_Library_add_cobjects,py2uno_wrapper,\
+ py2uno/source/module/pyuno_dlopenwrapper \
@@ -246,7 +244,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,49 +0,0 @@
+@@ -1,47 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
@@ -281,7 +279,6 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-$(eval $(call gb_Library_add_ldflags,pyuno_wrapper,-nostdlib))
-$(eval $(call gb_Library_add_libs,pyuno_wrapper,-lc))
-
--ifneq ($(OS)$(COM),WNTMSC)
-ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
-
-$(eval $(call gb_Library_add_libs,pyuno_wrapper,\
@@ -289,7 +286,6 @@ diff -urN pyuno/Library_pyuno.mk py2uno/Library_pyuno.mk
-))
-
-endif
--endif
-
-$(eval $(call gb_Library_add_cobjects,pyuno_wrapper,\
- pyuno/source/module/pyuno_dlopenwrapper \
diff --git a/rules b/rules
index efb9ee3..8400073 100755
--- a/rules
+++ b/rules
@@ -969,7 +969,7 @@ ifneq (,$(filter boost, $(SYSTEM_STUFF)))
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev (>= 0.7.1)
+ BUILD_DEPS += , libmdds-dev (>= 0.8.0)
endif
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
--
LibreOffice packaging repository
Reply to: