[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-6.0

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 545afcdd70cee2907c4b3072fc3f2cc4044376f8
Merge: 97eceda 11f2227
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Aug 30 21:29:09 2017 +0200

    Merge remote-tracking branch 'origin/master' into debian-experimental-6.0

 changelog              | 38 ++++++++++++++++++++------------------
 control                | 26 +++++++++++++++-----------
 control.in             | 17 +++++++++++------
 control.sdk.in         |  4 ++--
 patches/series         |  1 +
 rules                  | 32 ++++++++++++++++++++++++++++++--
 scripts/gid2pkgdirs.sh | 12 +++++++++++-
 7 files changed, 90 insertions(+), 40 deletions(-)

diff --cc changelog
index d12f5db,f12fcd3..3b42aed
--- a/changelog
+++ b/changelog
@@@ -1,19 -1,7 +1,20 @@@
- libreoffice (1:6.0.0~alpha0~git20170828-1) UNRELEASED; urgency=medium
++libreoffice (1:6.0.0~alpha0~git20170830-1) UNRELEASED; urgency=medium
 +
 +  [ Rene Engelhard ]
 +  * New upstream snapshot
 +
 +  * merge from Ubuntu, thanks Rico Tzschichholz:
 +    - Add "elementary" style package
 +
 +  [ Rico Tzschichholz ]
 +  * Add Kannada (kn) langpack
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
 +
- libreoffice (1:5.4.1~rc1-1) UNRELEASED; urgency=medium
+ libreoffice (1:5.4.1-1) unstable; urgency=medium
  
-   * New upstream release candidate
+   * New upstream release
+     - fixes middle click paste (closes: #871588)
  
    * debian/patches/stop-shipping-mimelnk-desktop-files.diff: as name says
      (closes: #872001)
diff --cc control
index e682445,e3b081f..4d9b18c
--- a/control
+++ b/control
@@@ -190,9 -186,9 +189,9 @@@ Build-Conflicts: amd-libopencl1
                   nvidia-glx-legacy-dev,
                   nvidia-libopencl1
  Standards-Version: 4.0.1
 -Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
 +Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
  Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
- Bugs: mailto:debian-openoffice at lists.debian.org
+ Bugs: 
  Homepage: http://www.libreoffice.org
  
  Package: libreoffice
diff --cc patches/series
index b476ede,98d02d2..e5569a2
--- a/patches/series
+++ b/patches/series
@@@ -27,3 -28,7 +27,4 @@@ system-officeotron-and-odfvalidator.dif
  no-openssl.diff
  disable-some-sc-tests-with-internal-cppunit.diff
  cppunit-optional.diff
+ disable-unused-test-programs.diff
 -gb_SUPPRESS_TESTS.diff
 -stop-shipping-mimelnk-desktop-files.diff
 -java9.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git