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

Rene Engelhard rene at moszumanska.debian.org
Mon Oct 17 17:51:48 UTC 2016 

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 41210e0b27c57448229229e124a04b87358d4cde
Merge: 9ad6c14 8c54cd9
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Oct 17 19:51:28 2016 +0200

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

 changelog     | 20 +++++++++++---------
 control       | 19 -------------------
 rules         |  6 +++---
 tests/control |  2 +-
 4 files changed, 15 insertions(+), 32 deletions(-)

diff --cc changelog
index bcd18b9,3b6390e..bc07d1e
--- a/changelog
+++ b/changelog
@@@ -1,41 -1,16 +1,41 @@@
 +libreoffice (1:5.3.0~alpha0~git20161016-1) UNRELEASED; urgency=medium
 +
 +  * New upstream snapshot 
 +    - fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
 +    - fixes (experimental) Gtk print dialog crash (closes: #839701)
 +
 +  * debian/control.{lang,help}.in: use ${help-l10n-virtual-version} as
 +    versioned Provides
 +  * debian/rules, debian/control.transitionals.in: remove jessie->stretch
 +    transitionals again
 +  * debian/rules, control.gcj.in: cleanup:
 +    - remove support for gcj (and thus building -gcj "native") completely;
 +      removed upstream; and also openjdk-9 apparently will drop support for
 +      source/target 1.5 (which gcj only supports) and gcc-7 apparently even
 +      will drop gcj, too
 +      (also the officeotron/odfvalidator stuff fails because due to the java-gcj
 +      in the path for safety reasons it picks up gcj..)
 +    - use java6_architectures for computing OOO_JAVA_ARCHS
 +  * debian/copyright: add schema/*/* to Files-Excluded: :/
 +  * debian/uno-libs3.symbols: update
 +  * debian/rules:
 +    - bump dh compat to 10
 +
 + -- Rene Engelhard <rene at debian.org>  Thu, 26 May 2016 20:00:57 +0200
 +
- libreoffice (1:5.2.3~rc1~git20161009-1) UNRELEASED; urgency=medium
- 
-   * New upstream snapshot
+ libreoffice (1:5.2.3~rc1-2) unstable; urgency=medium
  
    * debian/rules:
-     - install LOKDocView-0.1.typelib into multiarch dir as recommended by
-       the GI mini policy
+     - disable mysql connector given mysql-* will be removed for stretch and
+       mysql-connector-c++ should probably stay mysql for mysql-workbench
+     - if enabling mysql connector, use default (mariadb) as flavour and internal
+       mysqlcppconn
  
-  -- Rene Engelhard <rene at debian.org>  Wed, 07 Sep 2016 23:57:23 +0200
+  -- Rene Engelhard <rene at debian.org>  Mon, 17 Oct 2016 19:10:29 +0200
  
- libreoffice (1:5.2.2-1) unstable; urgency=medium
+ libreoffice (1:5.2.3~rc1-1) unstable; urgency=medium
  
-   * LibreOffice 5.2.2 final release (identical to rc2)
+   * New upstream release candidate
  
    * debian/patches/startcenter-grey-out-not-installed.diff: backport from
      master, as name says (closes: #813430)
diff --cc control
index e2086d3,1048f99..1662984
--- a/control
+++ b/control
@@@ -4547,24 -4564,8 +4544,8 @@@ Description: PostgreSQL SDBC driver fo
   LibreOffice without any wrapper layer such as ODBC or JDBC.
  Homepage: http://wiki.documentfoundation.org/PostgreSQL-SDBC
  
- Package: libreoffice-mysql-connector
- Section: misc
- Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
- Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
- Suggests: default-mysql-server | virtual-mysql-server
- Conflicts: libreoffice-common (<< 1:3.5~),
-            libreoffice-core (<< 1:3.5~),
-            ure (<< 1.5.1+OOo3.1.1-15)
- Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
- Description: MariaDB/MySQL Connector extension for LibreOffice
-  LibreOffice is a full-featured office productivity suite that provides
-  a near drop-in replacement for Microsoft(R) Office.
-  .
-  The MariaDB/MySQL Connector extension allows one to use the MariaDB or MySQL
-  database from LibreOffice without any wrapper layer such as ODBC or JDBC.
- 
  Package: libreoffice-evolution
 -Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386 hppa ia64 s390 sparc
 +Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
  Section: gnome
  Pre-Depends: ${misc:Pre-Depends}
  Depends: libreoffice-base,
diff --cc rules
index 0850d18,527b5d6..8cd18a5
--- a/rules
+++ b/rules
@@@ -408,12 -415,12 +408,12 @@@ els
  CPPUNIT_MINVER=0.12
  endif
  DEFAULT_IMAGE=galaxy
 -IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze
 +IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze breeze_dark
- ENABLE_MYSQLNATIVE=y
- MYSQL_FLAVOUR=mysql
+ ENABLE_MYSQLNATIVE=n
+ MYSQL_FLAVOUR=default
  # set this also to y for system-mysql..
  SYSTEM_STUFF += mariadb
- SYSTEM_STUFF += mysql-cppconn
+ #SYSTEM_STUFF += mysql-cppconn
  ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
  MYSQLCPPCONN_MINVER= (>= 1.1.3-7)
  else
diff --cc tests/control
index c6cdf3b,f9f2ce7..8bc597b
--- a/tests/control
+++ b/tests/control
@@@ -1,5 -1,5 +1,5 @@@
  Tests: junit-subsequentcheck
- Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg [...]
 -Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~ [...]
++Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg [...]
  
  Tests: pyuno-import
  Depends: python3-uno

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

More information about the Pkg-openoffice-commits mailing list