This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.1
in repository libreoffice.
commit f57f4b5a5eb21e430a82e1f68809da43cb178906
Merge: 8c8db1e 8d9c8b8
Author: Rene Engelhard <r...@debian.org>
Date: Tue Aug 20 19:21:54 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.1
changelog | 3 +++
control | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --cc changelog
index 57e0432,b64bb7e..2247744
--- a/changelog
+++ b/changelog
@@@ -21,24 -18,11 +21,27 @@@ libreoffice (1:4.1.1~rc1-2) UNRELEASED
* debian/libreoffice-script-provider-python.bug-script: remove, obsolete;
it's not an extension anymore
+ * merge from Ubuntu:
+ - debian/control.debug.in: s/python-uno/python3-uno/
+
-- Rene Engelhard <r...@debian.org> Mon, 12 Aug 2013 10:49:11 +0200
+libreoffice (1:4.1.1~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ * debian/rules:
+ - remove PYTHONPATH setting in soffice again and add
+ proper PYUNO_LOADER_PYTHONPATH=$ORIGIN to pythonloader.unorc,
+ thanks Fedora for the hint
+ - use default-jdk:
+ + update for java-common (>= 0.49). use java_defaults.mk to populate
+ OOO_JAVA_ARCHS/OOO_GCJ_(JDK_)ARCHS/OOO_OPENJDK_ARCHS
+ + clean up jre depends:
+ remove java-gcj-compat, prefer 7 over 6 except on ia64 (just 7)
+
+ -- Rene Engelhard <r...@debian.org> Tue, 06 Aug 2013 19:36:23 +0200
+
libreoffice (1:4.1.0-4) unstable; urgency=low
* debian/rules:
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vbpdc-0000sy...@vasks.debian.org
