This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.0
in repository libreoffice.
commit 54581c984c7fdfb67691a026040ce5433b4853f5
Merge: 0cfc277 55fd281
Author: Rene Engelhard <r...@debian.org>
Date: Thu Jul 30 17:39:04 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.0
Conflicts:
changelog
rules
changelog | 2 ++
control | 10 ++++++++++
rules | 14 +++++++-------
3 files changed, 19 insertions(+), 7 deletions(-)
diff --cc changelog
index 73cd1a8,85ba475..8349bd9
--- a/changelog
+++ b/changelog
@@@ -1,32 -1,16 +1,34 @@@
-libreoffice (1:4.4.5-1) unstable; urgency=medium
-
- * New upstream release
+libreoffice (1:5.0.0~rc4-2) UNRELEASED; urgency=medium
* debian/rules:
+ - ENABLE_MERGELIBS=n on kfreebsd-* for now ("Argument list too long")
+ - ENABLE_COLLADA=y (for i386/amd64) now that the libs finally are in
+ Debian
- -- Rene Engelhard <r...@debian.org> Tue, 28 Jul 2015 08:16:45 +0200
+ -- Rene Engelhard <r...@debian.org> Tue, 28 Jul 2015 00:27:08 +0200
+
+libreoffice (1:5.0.0~rc4-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - ENABLE_MERGELIBS=y as it's now upstream default
+
+ -- Rene Engelhard <r...@debian.org> Sat, 25 Jul 2015 11:59:25 +0200
-libreoffice (1:4.4.4-1) unstable; urgency=medium
+libreoffice (1:5.0.0~rc3-1) experimental; urgency=medium
- * New upstream release
+ * New upstream release candidate
+
+ * debian/rules:
+ - re-enable CVE tests on all platforms again now that the infinite loop
with
+ unsigned char-default is supposedly fixed
+
+ -- Rene Engelhard <r...@debian.org> Sun, 12 Jul 2015 13:04:30 +0200
+
+libreoffice (1:5.0.0~rc2-1) experimental; urgency=medium
+
+ * New upstream release candidate
* debian/control.in:
- s/cliipart/clipart/ (closes: #787660 again)
diff --cc control
index 67a0653,a2ec38e..cbdd30c
--- a/control
+++ b/control
@@@ -96,9 -98,10 +98,10 @@@ Build-Depends: ant (>= 1.7.0)
libodfgen-dev (>= 0.1),
liborcus-dev (>= 0.9.0),
libpagemaker-dev,
+ libpcre3-dev [amd64 i386],
libpng12-dev,
libpoppler-cpp-dev,
- libpoppler-dev (>= 0.8.0),
+ libpoppler-dev (>= 0.12.0),
libpoppler-private-dev,
libpq-dev (>= 9.0~),
libqt4-dev (>= 4:4.8),
@@@ -4438,9 -4431,10 +4445,10 @@@ Depends: ant (>= 1.7.0)
libodfgen-dev (>= 0.1),
liborcus-dev (>= 0.9.0),
libpagemaker-dev,
+ libpcre3-dev,
libpng12-dev,
libpoppler-cpp-dev,
- libpoppler-dev (>= 0.8.0),
+ libpoppler-dev (>= 0.12.0),
libpoppler-private-dev,
libpq-dev (>= 9.0~),
libqt4-dev (>= 4:4.8),
--
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: https://lists.debian.org/e1zkpxv-0003mk...@moszumanska.debian.org
