[libreoffice] 03/03: Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 2ce8f8167699d31ebb4273fef05defefc88ca567
Merge: f85e698 6477af9
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 20 13:38:32 2016 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
Conflicts:
changelog
changelog | 17 ++++++++++++++---
control | 8 ++++----
control.gtk3.in | 2 +-
rules | 30 +++++++++++++++++++-----------
4 files changed, 38 insertions(+), 19 deletions(-)
diff --cc changelog
index 551637e,390ba7b..a9bb0df
--- a/changelog
+++ b/changelog
@@@ -1,12 -1,14 +1,20 @@@
+libreoffice (1:5.2.0~alpha1~git20160120-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <rene@rene-engelhard.de> Thu, 26 Nov 2015 10:37:57 +0100
+
- libreoffice (1:5.1.0~rc2~git20151222-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.1.0~rc2-2) UNRELEASED; urgency=medium
- * New upstream snapshot
+ * debian/rules:
+ - -officebean is a arch-dep package, move pom generation and mh_*
+ calls for it to install-arch...
+
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Dec 2015 01:50:15 +0100
+
+ libreoffice (1:5.1.0~rc2-1) experimental; urgency=medium
+
+ * New upstream release candidate
* debian/patches/disable-db-tests.diff,
debian/patches/smoketest-disable-extension-tests.diff: make apply again...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: