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 09cc968ec6784239a89286e7eb8002e631d58243
Merge: 5d7871d 6cbc8dc
Author: Rene Engelhard <r...@debian.org>
Date: Wed Mar 2 08:38:29 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
changelog | 16 ++++++++++++++--
control | 5 +++--
control.sdk.in | 1 -
rules | 32 ++++++++++++++++++++++++--------
4 files changed, 41 insertions(+), 13 deletions(-)
diff --cc changelog
index dd4a438,604b8e9..bd9da07
--- a/changelog
+++ b/changelog
@@@ -1,11 -1,6 +1,13 @@@
+libreoffice (1:5.2.0~alpha1~git20160220-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - fixes SVG t(ext s)pan import (closes: #665094)
+
+ -- Rene Engelhard <r...@rene-engelhard.de> Thu, 26 Nov 2015 10:37:57 +0100
+
- libreoffice (1:5.1.1~rc1-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.1.1~rc3-1) UNRELEASED; urgency=medium
+
+ * New upstream release candidate
* debian/rules:
- somewhen m68k vanished from OOO_ARCHS; readd ;)
diff --cc control
index aa5d065,ea756b5..4782cd6
--- a/control
+++ b/control
@@@ -184,9 -187,9 +185,9 @@@ Build-Conflicts: amd-libopencl1
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
-b debian-experimental-5.2
Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
- Bugs: mailto:debian-openoffice@lists.debian.org
+ Bugs:
Homepage: http://www.libreoffice.org
Package: libreoffice
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
