[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-4.1
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 ba9ced2e46b1e8b9205e65d715b0f9b7583494e3
Merge: d9ece5d 5cca04e
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 5 22:02:29 2013 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-4.1
Conflicts:
changelog
changelog | 9 +++++++++
control | 4 +++-
rules | 28 ++++++++++++++++++++++++++--
3 files changed, 38 insertions(+), 3 deletions(-)
diff --cc changelog
index bc81193,9e1c93a..1483281
--- a/changelog
+++ b/changelog
@@@ -1,10 -1,12 +1,19 @@@
+libreoffice (1:4.1.2~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+ - fixes debug logging for python3 in pythonscript.py (closes: #719941)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 25 Aug 2013 15:23:17 +0200
+
+ libreoffice (1:4.1.1-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix curl conditional to really add libcurl4-<whatever>-dev builddep....
+ - disable graphite2 for armel and sparc for wheezy-backports
+ - build using gcj-jdk for kfreebsd-* on wheezy-backports
+
+ -- Rene Engelhard <rene@debian.org> Tue, 03 Sep 2013 18:05:31 +0200
+
libreoffice (1:4.1.1-1) unstable; urgency=low
* LibreOffice 4.1.1 final (identical to rc2)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: