[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-108-ge6e4bf0
The following commit has been merged in the debian-experimental-3.5 branch:
commit a2b2e2998e747f18a1acf5559d23d5b4f838bdca
Author: Rene Engelhard <rene@debian.org>
Date: Tue Nov 29 22:58:44 2011 +0000
update snapshot; update patches
diff --git a/changelog b/changelog
index aebf26c..71fa90b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~alpha0~git20111121-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~alpha0~git20111129-1) UNRELEASED; urgency=low
[ Rene Engelhard ]
* new upstream snapshot
@@ -38,7 +38,7 @@ libreoffice (1:3.5.0~alpha0~git20111121-1) UNRELEASED; urgency=low
* add icedove and thunderbird as fallbacks
* migrate sensible-browser.diff from libreoffice/build
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 24 Nov 2011 17:48:42 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 29 Nov 2011 21:55:24 +0000
libreoffice (1:3.4.4-2) UNRELEASED; urgency=medium
diff --git a/patches/odk-jni-include.diff b/patches/odk-jni-include.diff
index 60f1591..4d4eab4 100644
--- a/patches/odk-jni-include.diff
+++ b/patches/odk-jni-include.diff
@@ -1,11 +1,10 @@
--- libreoffice-3.5.0/odk/source/unowinreg/win/makefile.mk-old 2011-06-25 10:18:32.000000000 +0200
+++ libreoffice-3.5.0/odk/source/unowinreg/win/makefile.mk 2011-06-25 10:19:22.000000000 +0200
-@@ -62,7 +62,7 @@
- .IF "$(BUILD_UNOWINREG)" == "YES"
+@@ -63,6 +63,7 @@
$(BIN)$/unowinreg.dll : unowinreg.cxx
-- $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ $(JAVA_INCLUDES) \
-+ $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ $(JAVA_INCLUDES) -I/usr/lib/gcc/`dpkg-architecture -qDEB_BUILD_GNU_TYPE`/`gcc --version | head -n 1 | awk '{ print $$4 }'`/include \
- -I$(PRJ)/inc/pch -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \
+ $(MINGWCXX) -Wall -D_JNI_IMPLEMENTATION_ $(JAVA_INCLUDES) \
++ -I/usr/lib/gcc/`dpkg-architecture -qDEB_BUILD_GNU_TYPE`/`gcc --version | head -n 1 | awk '{ print $$4 }'`/include \
+ -shared -o $(BIN)$/unowinreg.dll unowinreg.cxx \
-Wl,--kill-at -lkernel32 -ladvapi32
$(MINGWSTRIP) $(BIN)$/unowinreg.dll
diff --git a/patches/rhino-build-optional.diff b/patches/rhino-build-optional.diff
index 61b87dc..2f24d74 100644
--- a/patches/rhino-build-optional.diff
+++ b/patches/rhino-build-optional.diff
@@ -54,6 +54,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 DESKTOP: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 configmgr 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 DESKTOP: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 configmgr 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 DESKTOP: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 configmgr connectivity cppcanvas cppu cppuhelper DESKTOP: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 DESKTOP: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 configmgr connectivity cppcanvas cppu cppuhelper DESKTOP: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
diff --git a/patches/series b/patches/series
index 3ef96cf..d7b5d69 100644
--- a/patches/series
+++ b/patches/series
@@ -10,7 +10,7 @@ disable-dynamic-list-cpp.diff
libebook-1.2.so.12.diff
make-gengal-work-again.diff
fix-system-lpsolve-build.diff
-install-no-dependency-on-build.diff
+#install-no-dependency-on-build.diff
cleanup-distro-install-file-lists.diff
smoketest-only-en-US.diff
getMIMEDescription-mismatch.diff
--
LibreOffice packaging repository
Reply to: