[libreoffice] 02/02: Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 55cdd6b4ad3d2464e24970ec529fa9b96e7dac20
Merge: b809667 2143740
Author: Rene Engelhard <rene@debian.org>
Date: Fri Aug 21 21:20:57 2015 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.1
changelog | 30 ++++++
control | 48 ++--------
patches/gtk3-rtl.diff | 104 +++++++++++++++++++++
rules | 46 ++++++---
source.lintian-overrides | 4 -
tests/control | 3 +
tests/junit-subsequentcheck | 22 +----
tests/patches/java-subsequentcheck-standalone.diff | 41 ++++----
tests/pyuno-import | 3 +
9 files changed, 211 insertions(+), 90 deletions(-)
diff --cc changelog
index 36c4a82,2ea0c11..64bc1f6
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,33 +1,43 @@@
+libreoffice (1:5.1.0~alpha1~git20150817-1) UNRELEASED; urgency=medium
+
+ * New upstream snapshot
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,eb} architecture stuff which is now added upstream
+ * debian/uno-libs3.symbols: update
+
+ -- Rene Engelhard <rene@debian.org> Mon, 01 Jun 2015 20:29:43 +0200
+
+ libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
+
+ * debian/patches/gtk3-rtl.diff: backport GTk3 RTL fixes (arrows, checkboxes)
+ from libreoffice-5-0
+
+ * debian/rules:
+ - bump libmysqlcppconn-dev and libclucene-dev build-deps to their
+ gcc 5 versions
+ - add explicit dh-python build-dependency
+ - temporarily disable -kde (KDE uninstallable in sid right now
+ anyway) and coinmp
+ - fix autogen.sh for autopkgtests by exporting the needed env vars there,
+ too
+
+ * debian/tests/control, debian/tests/pyuno-import: add trivial import uno;
+ test for python3-uno
+
+ * merge from Ubuntu:
+ - autopkgtest updates/fixes
+ - add ENABLE_LTO conditional, off
+
+ -- Rene Engelhard <rene@debian.org> Wed, 12 Aug 2015 15:23:58 +0200
+
+ libreoffice (1:5.0.1~rc1-2) unstable; urgency=medium
+
+ * debian/patches/series: (re-)enable disable-tiledrendering-test.diff;
+ still fails...
+
+ -- Rene Engelhard <rene@debian.org> Sun, 09 Aug 2015 16:40:13 +0200
+
libreoffice (1:5.0.1~rc1-1) unstable; urgency=medium
* New upstream release candidate
diff --cc control
index 54b3624,53dbece..51adb1b
--- a/control
+++ b/control
@@@ -11,11 -11,10 +11,10 @@@ Build-Depends: ant (>= 1.7.0) [!mips64e
binutils (>= 2.23) [mips mipsel],
bison,
bzip2,
- coinor-libcoinmp-dev,
- coinor-libcoinutils-dev,
debhelper (>= 7.2.3~),
- default-jdk,
default-jdk (>= 1:1.7-48) [ia64],
+ default-jdk [!mips64eb],
+ dh-python,
dpkg-dev (>= 1.16.1),
fastjar,
firebird-dev (>= 2.5.2.26540.ds4-2) [!hppa !mips !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc],
@@@ -191,9 -187,9 +188,9 @@@ Build-Conflicts: amd-libopencl1
Standards-Version: 3.9.4
XS-Python3-Version: 3.4
XS-Testsuite: autopkgtest
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.1
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
--Bugs:
++Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@@ -4276,32 -4271,9 +4272,9 @@@ Description: LibreOfficeKit -- header
.
This package contains the headers needed for using LibreOfficeKit.
- Package: libreoffice-kde
- Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel mips64eb mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc
- Depends: libreoffice-core (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
- Recommends: ${kde-iconset-dep}
- Suggests: kmail, konqueror, libreoffice-kab
- Section: kde
- Enhances: libreoffice
- Replaces: libreoffice-core (= 1:3.5.0~beta2-1),
- libreoffice-core (= 1:4.3.0~beta1-1),
- openoffice.org-kde (<< 1:3.3.0~)
- Description: office productivity suite -- KDE integration
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the KDE plugin for drawing OOo's widgets with
- KDE/Qt and a KDEish File Picker when running under KDE.
- You can extend the functionality of this by installing these packages:
- .
- * konqueror / kmail
- * libreoffice-kab: KDE Addressbook support
-
Package: libreoffice-sdbc-postgresql
Section: misc
-Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}, ${shlibs:Depends}
Suggests: postgresql (>= 8.4)
Breaks: ure (<< 1.5.1+OOo3.1.1-15)
@@@ -4331,7 -4303,7 +4304,7 @@@ Description: MariaDB/MySQL Connector ex
database from LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-evolution
--Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
++Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386
Section: gnome
Depends: libreoffice-base,
libreoffice-common (>= 1:3.4.0~),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: