[libreoffice] 03/03: Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit fdfb138024747619626c5341931af13f2cc74951
Merge: 58ed2cb e08300e
Author: Rene Engelhard <rene@debian.org>
Date: Fri Oct 9 21:33:51 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
patches/series
rules
changelog | 12 ++++++++----
control | 2 +-
patches/fix-internal-hsqldb-build.diff | 4 ++--
rules | 1 +
4 files changed, 12 insertions(+), 7 deletions(-)
diff --cc changelog
index f96a72a,d0adf24..6797b25
--- a/changelog
+++ b/changelog
@@@ -1,35 -1,6 +1,37 @@@
+libreoffice (1:5.1.0~alpha1~git20151009-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - uses HttpURLConnection etc. of the JDK instead of commons httpclient
+ in the Wiki Publisher (closes: #800992)
+
+ * debian/patches/series, debian/patches/disable-tiledrendering-test.diff:
+ remove again, we need the functionality for liblibreofficekitgtk.so
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,eb} architecture stuff which is now added upstream
+ * debian/uno-libs3.symbols: update
+ * debian/control.lokit.in:
+ - suggest libgtk-3-dev instead of libgtk2.0-dev
+ - suggest gir-1.2-lokdocview-0.1
+ * debian/control*in, debian/rules:
+ - remove upstream gone kdeab and gnome-vfs options
+ * debian/control*.in, debian/rules:
+ - package the LOKDocView introspection stuff into gir1.2-lokdocview-0.1
+ - move liblibreofficekitgtk.so into -gtk3 as it's for Gtk3 now
+ * debian/rules:
+ - gtk3 is on per default now (closes: #799399, #681180)
+ - disable the tests for now
+ * debian/rules: prepare for .ddebs: disable manual -dbg build if building
+ ddebs; use dh_strip --ddeb-migration to create .ddebs
+
+ * merge from Ubuntu:
+ - add am and gug locales
+
+ -- Rene Engelhard <rene@debian.org> Wed, 23 Sep 2015 14:41:59 +0200
+
- libreoffice (1:5.0.2-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.0.3~rc1-1) unstable; urgency=medium
+
+ * New upstream release candidate
* debian/rules:
- use dh_installdocs --link-doc=libreoffice-{core,common}
diff --cc control
index 342e27d,2e796a7..30991ca
--- a/control
+++ b/control
@@@ -182,9 -186,9 +182,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.0
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.1
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
Reply to: