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

[Rene Engelhard]

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

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

commit a3cadb450a6fe745f489ce494324893a4c54c2aa
Merge: f501940 3662402
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Nov 28 12:31:12 2016 +0100

    Merge remote-tracking branch 'origin/debian-experimental-5.2' into debian-experimental-5.3
    
    Conflicts:
    	changelog
    	patches/series

 changelog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --cc changelog
index 9f8195d,134f685..4f1ce26
--- a/changelog
+++ b/changelog
@@@ -1,28 -1,29 +1,30 @@@
- libreoffice (1:5.3.0~beta1-2) UNRELEASED; urgency=medium
 -libreoffice (1:5.2.4~rc1~git20161125-1) UNRELEASED; urgency=medium
++libreoffice (1:5.3.0~beta2~git20161128-1) UNRELEASED; urgency=medium
+ 
+   * New upstream snapshot
 -    - fixes (experimental) Gtk print dialog crash (closes: #839701)
 -    - fixes copy paste cells between two tables of two documents with Gtk3
 -      (closes: #834622)
 -    - fixes tooltips when dragging/filling cells with Gtk3 (closes: #831977)
 -
 -  * debian/patches/m68k-java-arch.diff: fix Java arch for m68k, patch by
 -    John Paul Adrian Glaubitz
  
 - -- Rene Engelhard <rene at debian.org>  Tue, 11 Oct 2016 20:24:12 +0200
 -
 -libreoffice (1:5.2.3-2) unstable; urgency=medium
 +  * debian/rules:
 +    - fix typo in chromium build-deps: s/amd64/arm64/
 +  * debian/libreoffice-sdbc-firebird.NEWS: add NEWS entry about the format
 +    incompatibility
  
 -  * debian/libreoffice-common.maintscript: remove apparently unneeded quotes
 -    which now breaks at dpkg-maintscript-helper call...
 + -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
  
 - -- Rene Engelhard <rene at debian.org>  Thu, 17 Nov 2016 09:45:57 +0100
 +libreoffice (1:5.3.0~beta1-1) experimental; urgency=medium
  
 -libreoffice (1:5.2.3-1) unstable; urgency=medium
 +  * New upstream beta release
  
 -  * LibreOffice 5.2.3 final release (identical to rc3) 
 +  * try using just the used tarballs to avoid confusion and to shrink the
 +    .orig (they are downloaded anyway and not in the .orig)
 +    - remove unneeded tarballs from tarballs
 +    - include needed tarballs in include-binaries
 +    - update debian/copyright (remove many, add forgotten swingEx
 +      fix src -> tarballs; actually add MPL-2.0/ASF blurb) 
 +    - update README.Debian-source
  
 -  * debian/patches/show-vcl-backend-in-about.diff: as name says; backport from
 -    master
 +  * debian/patches/fix-system-lpsolve-build.diff: rename to ..
 +  * build-against-shared-lpsolve.diff: ... this to make the purpose more clear
 +  * debian/patches/fix-system-lpsolve-build.diff: add new one adding
 +    -llpsolve55_pic test/linkage (disabled)
    * debian/patches/no-openssl.diff: don't uselessly check for openssl and
      don't require openssl in postgresql-sdbc-impl, not (directly) used
  

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