[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 63d29cdaccd5b2d2885e7da7dce2c2b86f495f3f
Merge: d7567b8 3792aa3
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 3 17:34:14 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
patches/series
changelog | 10 ++++++----
patches/bash-completion-dir.diff | 22 ++++++++++++++++++++++
patches/series | 1 +
rules | 3 ---
scripts/gid2pkgdirs.sh | 2 +-
5 files changed, 30 insertions(+), 8 deletions(-)
diff --cc changelog
index 35d3193,c823e29..fa78e04
--- a/changelog
+++ b/changelog
@@@ -1,40 -1,21 +1,42 @@@
-libreoffice (1:5.0.5~rc1-2) UNRELEASED; urgency=medium
+libreoffice (1:5.1.1~rc1~git20160203-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - fixes scrolling direction with trackpad in gtk3 (closes: #809363)
+ * debian/patches/bash-completion-dir.diff: add from master;
+ install bash completion to "new" /usr/share/bash-completion/completions
+ * debian/patches/tdf96653.diff: backport tdf#96653 fix from master
+ (fix (PNG) images in PDF export), closes: #813586
- * debian/scripts/gid2pkgdirs.sh,
- debian/libreoffice-common.{post,pre}{rm,inst}.in:
- install bash completion to "new" /usr/share/bash-completion/completions,
- thanks lintian, rm_conffile /etc/bash_completion.d/libreoffice.sh
- * debian/rules:
- - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
- openjdks and add openjdk-8-jre
+ * debian/libreoffice-common.{post,pre}{rm,inst}.in:
+ rm_conffile /etc/bash_completion.d/libreoffice.sh
+ * debian/scripts/gid2pkgdirs.sh: adapt for bash_completion move and install
+ without .sh
- -- Rene Engelhard <rene@debian.org> Tue, 02 Feb 2016 19:37:16 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Dec 2015 01:50:15 +0100
+
+libreoffice (1:5.1.0~rc3-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/gcc-6.diff: backport gcc 6 compile/test fixes from master
+ (closes: #811686)
+ * debian/patches/GCC-6-PR69273-workaround.diff: add gcc 6 ICE workaround
+ from Stephan Bergmann
+
+ * debian/rules:
+ - -officebean is a arch-dep package, move pom generation and mh_*
+ calls for it to install-arch...
+ - adapt for changed debhelper internals to make out -dbgsym hacks work
+ again and build-depend on debhelper >= 9.20160115
+ - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
+ openjdks and add openjdk-8-jre
+
+ -- Rene Engelhard <rene@debian.org> Wed, 27 Jan 2016 08:37:19 +0100
-libreoffice (1:5.0.5~rc1-1) unstable; urgency=medium
+libreoffice (1:5.1.0~rc2-1) experimental; urgency=medium
- * New upstream release candidate
+ * New upstream release candidate
* debian/patches/disable-db-tests.diff,
debian/patches/smoketest-disable-extension-tests.diff: make apply again...
diff --cc patches/series
index 2e5ab19,1e83637..2fbd1c4
--- a/patches/series
+++ b/patches/series
@@@ -27,8 -28,7 +27,9 @@@ odk-no-dot.dif
hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
-liborcus-0.9.1.diff
debian-branding.diff
-icu-56.diff
+disable-npapi-plugin-support.diff
+gcc-6.diff
+GCC-6-PR69273-workaround.diff
+ bash-completion-dir.diff
+tdf96653.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: