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 bc2dc9fac35497b727670577c68d3001e03f60a8
Merge: c1bba56 9ca70aa
Author: Rene Engelhard <r...@debian.org>
Date: Tue May 10 10:17:28 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
control
control.in
patches/liborcus-0.11.diff
patches/series
changelog | 11 +++++++++--
control | 6 +++---
control.in | 4 ++--
patches/kde4-cflags-no-usr-include.diff | 26 ++++++++++++++++++++++++++
patches/series | 1 +
rules | 6 ------
6 files changed, 41 insertions(+), 13 deletions(-)
diff --cc changelog
index fe30610,8b081af..8d613b1
--- a/changelog
+++ b/changelog
@@@ -1,36 -1,43 +1,43 @@@
-libreoffice (1:5.1.3~rc2-4) UNRELEASED; urgency=medium
-
- * debian/patches/kde4-cflags-no-usr-include.diff: don't set $kde_incdir
- to /usr/include since -isystem /usr/include makes the stuff FTBFS
- (closes: #823145)
-
- -- Rene Engelhard <r...@debian.org> Mon, 09 May 2016 19:53:53 +0200
-
-libreoffice (1:5.1.3~rc2-3) unstable; urgency=medium
-
- * debian/rules:
- - sigh. revert control changes for now, needs more work, apparently..
-
- -- Rene Engelhard <r...@debian.org> Sun, 08 May 2016 08:31:54 +0200
-
-libreoffice (1:5.1.3~rc2-2) unstable; urgency=medium
+libreoffice (1:5.2.0~alpha1-2) UNRELEASED; urgency=medium
+ [ Mattia Rizzolo ]
+ * debian/control.in: use nowdays canonical URIs in Vcs-*
+
+ [ Rene Engelhard ]
- * debian/rules:
- - remove explicit $(MAKE) -f debian/rules control
-
- -- Rene Engelhard <r...@debian.org> Sun, 08 May 2016 00:16:51 +0200
-
-libreoffice (1:5.1.3~rc2-1) unstable; urgency=medium
-
- * New upstream release candidate
++ * debian/patches/kde4-cflags-no-usr-include.diff: don't set $kde_incdir
++ to /usr/include since -isystem /usr/include makes the stuff FTBFS
++ (closes: #823145)
+
* debian/rules:
-- - print error in control without gcj-jdk installed
- don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset
+ - add initial build profile support: nodoc and nocheck
- disable the tests on kfreebsd-* (see #801865),
- move hardcoded (!)kfreebsd-i386 (!)kfreebsd-amd64 to (!)kfreebsd-any.
Use linux-any instead of just disabling it for kfreebsd for
libbbluetooth-dev B-D; reflects the sense better
- -- Rene Engelhard <r...@debian.org> Tue, 03 May 2016 00:01:09 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 05 May 2016 22:46:40 +0200
+libreoffice (1:5.2.0~alpha1-1) experimental; urgency=medium
+
+ * New upstream alpha release
+ - fixes SVG t(ext s)pan import (closes: #665094)
+
+ * debian/rules, debian/control.gtk3.in, debian/*.links: move
+ liblibreofficekitgtk.so into an own package, as we have
+ libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on
+ libreofficekit-data
+ * debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
+ to -gtk2
+ * debian/control.sdk.in, debian/rules: move arch-indep SDK stuff into new
+ -dev-common. Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to
+ (re)build unowinreg.dll in build-indep. Remove arch-qualifiers.
+ * debian/uno-libs3.symbols: update
+ * debian/tests/control.in, debian/tests/sdk-examples: remove unowinreg.dll
+ special-casing, we now have unowinreg.dll in a Arch: all. Depend on that.
+
+ -- Rene Engelhard <r...@debian.org> Thu, 21 Apr 2016 22:26:49 +0200
+
libreoffice (1:5.1.3~rc1-1) unstable; urgency=medium
* New upstream release candidate
diff --cc control
index 0d8be68,a772bd5..b018620
--- a/control
+++ b/control
@@@ -186,9 -187,9 +186,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
-b debian-experimental-5.2
- Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
- Bugs: mailto:debian-openoffice@lists.debian.org
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b
debian-experimental-5.2
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
+ Bugs:
Homepage: http://www.libreoffice.org
Package: libreoffice
diff --cc control.in
index 2d93185,77e457e..e6f0999
--- a/control.in
+++ b/control.in
@@@ -26,8 -26,8 +26,8 @@@ Build-Conflicts: ant (= 1.8.0-1) [%OOO_
amd-libopencl1,
nvidia-libopencl1
Standards-Version: 3.9.4
- 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
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b
debian-experimental-5.2
+ Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
Bugs: @BUGS@
Homepage: http://www.libreoffice.org
diff --cc patches/series
index d75739c,77bd49b..07f22ef
--- a/patches/series
+++ b/patches/series
@@@ -28,4 -29,10 +28,5 @@@ hppa-is-32bit.dif
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
-disable-npapi-plugin-support.diff
-gcc-6.diff
-bash-completion-dir.diff
-OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
-liborcus-0.11.diff
+ kde4-cflags-no-usr-include.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
