[libreoffice] 04/04: 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 b83483dc23db2e7a80011dd4ed113a4837ea9e47
Merge: 78fae17 8d9f930
Author: Rene Engelhard <rene@debian.org>
Date: Tue Feb 2 20:06:36 2016 +0100
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
Conflicts:
changelog
changelog | 5 +++++
libreoffice-common.postinst.in | 1 +
libreoffice-common.postrm.in | 1 +
libreoffice-common.preinst.in | 1 +
scripts/gid2pkgdirs.sh | 4 ++--
5 files changed, 10 insertions(+), 2 deletions(-)
diff --cc changelog
index 4ceacb1,c75e27c..af7068d
--- a/changelog
+++ b/changelog
@@@ -1,32 -1,18 +1,37 @@@
-libreoffice (1:5.0.5~rc1-2) UNRELEASED; urgency=medium
+libreoffice (1:5.1.1~rc1~git20160201-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+ - fixes scrolling direction with trackpad in gtk3 (closes: #809363)
- * debian/rules:
- - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
- openjdks and add openjdk-8-jre
+ * 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
+
- -- 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 libreoffice-common.postinst.in
index a736474,1276802..b09f224
--- a/libreoffice-common.postinst.in
+++ b/libreoffice-common.postinst.in
@@@ -17,6 -17,7 +17,7 @@@ f
if [ "$1" = "configure" ]; then
dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/ooffice.sh" 1:3.3.0~rc4-2 libreoffice-common -- "$@"
- dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.0.5~rc2-1 libreoffice-common -- "$@"
++ dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.1-1~rc1-1 libreoffice-common -- "$@"
dpkg-maintscript-helper mv_conffile \
"/etc/openoffice/psprint.conf" "/etc/libreoffice/psprint.conf" "" libreoffice-common -- "$@"
diff --cc libreoffice-common.postrm.in
index 5aec23d,631f96b..d31dd3a
--- a/libreoffice-common.postrm.in
+++ b/libreoffice-common.postrm.in
@@@ -7,6 -7,7 +7,7 @@@ set -
case "$1" in
remove|abort-install|abort-upgrade)
dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/ooffice.sh" 1:3.3.0~rc4-2 libreoffice-common -- "$@"
- dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.0.5~rc2-1 libreoffice-common -- "$@"
++ dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.1.1~rc1-1 libreoffice-common -- "$@"
dpkg-maintscript-helper mv_conffile \
"/etc/openoffice/psprint.conf" "/etc/libreoffice/psprint.conf" "" libreoffice-common -- "$@"
diff --cc libreoffice-common.preinst.in
index da39b95,b8748ae..fc8a4f9
--- a/libreoffice-common.preinst.in
+++ b/libreoffice-common.preinst.in
@@@ -15,6 -15,7 +15,7 @@@ case "$1" in install|upgrade
fi
dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/ooffice.sh" 1:3.3.0~rc4-2 libreoffice-common -- "$@"
- dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.0.5~rc2-1 libreoffice-common -- "$@"
++ dpkg-maintscript-helper rm_conffile "/etc/bash_completion.d/libreoffice.sh" 1:5.1.1~rc1-1 libreoffice-common -- "$@"
if [ -n "$2" ] && dpkg --compare-versions "$2" lt "1:3.3.0-3"; then
if [ -d /share ]; then
rm -f /share/config/javasettingsunopkginstall.xml
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: