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 d6d24887eacc1188cdfbc697c482134970051162
Merge: 292c000 63d29cd
Author: Rene Engelhard <r...@debian.org>
Date: Wed Feb 3 17:43:20 2016 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.1' into
debian-experimental-5.2
Conflicts:
changelog
patches/gcc-6.diff
patches/series
changelog | 19 ++++++++++++++++++-
libreoffice-common.postinst.in | 1 +
libreoffice-common.postrm.in | 1 +
libreoffice-common.preinst.in | 1 +
patches/series | 1 +
rules | 9 ++++++---
scripts/gid2pkgdirs.sh | 6 +++---
shlibs.override.liblangtag | 1 +
8 files changed, 32 insertions(+), 7 deletions(-)
diff --cc changelog
index baf2530,fa78e04..a9974fc
--- a/changelog
+++ b/changelog
@@@ -1,9 -1,20 +1,26 @@@
- libreoffice (1:5.2.0~alpha1~git20160120-1) UNRELEASED; urgency=medium
++libreoffice (1:5.2.0~alpha1~git20160203-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ -- Rene Engelhard <r...@rene-engelhard.de> Thu, 26 Nov 2015 10:37:57 +0100
+
+ 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/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 <r...@debian.org> Sat, 19 Dec 2015 01:50:15 +0100
+
libreoffice (1:5.1.0~rc3-1) experimental; urgency=medium
* New upstream release candidate
diff --cc patches/series
index 504f0e1,2fbd1c4..3225d9f
--- a/patches/series
+++ b/patches/series
@@@ -28,3 -28,8 +28,4 @@@ 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
+ 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
