The following commit has been merged in the debian-experimental-3.5 branch:
commit 8432c1d3edb716b5a486c4ef2e526c3a490411a4
Author: Rene Engelhard <[email protected]>
Date: Tue Oct 25 22:44:32 2011 +0200
new snapshot (20111025); update patches
diff --git a/changelog b/changelog
index 822dc03..364b408 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~alpha0~git20111024-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~alpha0~git20111025-1) UNRELEASED; urgency=low
* new upstream snapshot
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 0a4a9e9..bc7f76d 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -3,8 +3,8 @@ index c0b76f8..d10222f 100644
--- libreoffice-3.5.0/configure.in
+++ libreoffice-3.5.0/configure.in
@@ -7936,6 +7936,13 @@ fi
- AC_MSG_RESULT([$BUILD_MAX_JOBS])
- AC_SUBST(BUILD_MAX_JOBS)
+ AC_SUBST(GMAKE_PARALLELISM)
+ AC_SUBST(GMAKE_MODULE_PARALLELISM)
+if [ -x /usr/bin/dpkg-buildflags ]; then
+ CDEFAULTOPT=`dpkg-buildflags --get CFLAGS 2>/dev/null | grep -E -o
"\-O[0-3]"`
@@ -69,14 +69,13 @@ diff --git a/solenv/inc/unxlngmips.mk
b/solenv/inc/unxlngmips.mk
index 53c927d..c1b7164 100644
--- libreoffice-3.5.0/solenv/inc/unxlngmips.mk
+++ libreoffice-3.5.0/solenv/inc/unxlngmips.mk
-@@ -27,7 +27,6 @@
+@@ -27,6 +27,5 @@
# mk file for Unix Linux Mips using GCC, please make generic modifications to
unxlng.mk
-CDEFAULTOPT=-Os
.INCLUDE : unxlng.mk
CDEFS+=-DMIPS
- DLLPOSTFIX=lm
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index 1bcbb66..acd84fb 100644
--- libreoffice-3.5.0/solenv/inc/unxlngr.mk
diff --git a/patches/rhino-build-optional.diff
b/patches/rhino-build-optional.diff
index a53d32d..e297403 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -64,6 +64,6 @@ index 2bd4c61..f874898 100644
--- libreoffice-3.5.0/tail_build/prj/build.lst-old 2011-10-20
22:44:37.000000000 +0000
+++ libreoffice-3.5.0/tail_build/prj/build.lst 2011-10-20
22:44:49.000000000 +0000
@@ -1,2 +1,2 @@
--tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx
basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker
javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo
DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot
stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure
vcl xmlhelp xmloff xmlscript xsltml NULL
-+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx
basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker
javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo
DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv
soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil
unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx
basic bridges canvas comphelper DESKTOP:connectivity cppcanvas cppu cppuhelper
fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo
DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot
stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure
vcl xmlhelp xmloff xmlscript xsltml NULL
++tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell
BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec
LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio
LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python
REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx
basic bridges canvas comphelper DESKTOP:connectivity cppcanvas cppu cppuhelper
fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo
DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal sax sfx2 solenv
soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil
unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
