[libreoffice] 01/02: Merge remote-tracking branch 'origin/master' 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 6d9389ac8481447072f18e8cce993c9d4d139287
Merge: 05f6630 427fb36
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Nov 1 06:52:21 2016 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.3
    
    Conflicts:
    	changelog
    	control

 changelog                                          |  5 +++
 control                                            |  4 +--
 control.in                                         |  3 +-
 ...uild.diff => build-against-shared-lpsolve.diff} |  0
 patches/fix-system-lpsolve-build.diff              | 39 ++++++++++++----------
 patches/series                                     |  3 +-
 6 files changed, 30 insertions(+), 24 deletions(-)

diff --cc changelog
index 4909d46,80d15d8..7cfc15a
--- a/changelog
+++ b/changelog
@@@ -1,7 -1,20 +1,12 @@@
 -libreoffice (1:5.2.3~rc3-1) unstable; urgency=medium
 +libreoffice (1:5.3.0~beta1~git20161026-1) UNRELEASED; urgency=medium
  
 -  * New upstream release candidate
 +  * New upstream snapshot
  
+   * 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/control.in:
 -    - remove -sdbc-firebird Recommends: in -base-drivers
 -      (closes: #842316, #841253) and the mentioning from the Desciption
 -
 - -- Rene Engelhard <rene at debian.org>  Mon, 31 Oct 2016 23:20:33 +0100
 -
 -libreoffice (1:5.2.3~rc1-4) unstable; urgency=medium
 -
    * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
      new multiarchified libvlc5
  
diff --cc control
index bea2002,2cd28b6..21c58fc
--- a/control
+++ b/control
@@@ -898,8 -902,7 +898,7 @@@ Suggests: libjtds-java
            libreoffice-mysql-connector | libmyodbc | libmysql-java,
            libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
            libsqliteodbc | tdsodbc | mdbtools
- Recommends: libreoffice-sdbc-firebird,
-             libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386]
 -Recommends: libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc]
++Recommends: libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386]
  Replaces: libreoffice-base (<< 1:4.3.0-3), libreoffice-core (<< 1:4.2~)
  Breaks: libreoffice-base (<< 1:4.3.0-3)
  Description: Database connectivity drivers for LibreOffice

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