This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit fbe18ac7a02884e436adececc84633bcedcc4d43
Merge: d537d75 056bd8f
Author: Rene Engelhard <r...@debian.org>
Date: Sat May 14 11:07:48 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
rules
source/include-binaries
tests/control
changelog | 5 +
libreoffice-base-core.lintian-overrides | 1 -
libreoffice-base.lintian-overrides | 1 -
libreoffice-calc.lintian-overrides | 1 -
libreoffice-core.lintian-overrides | 1 -
libreoffice-dev.lintian-overrides | 1 -
libreoffice-draw.lintian-overrides | 1 -
libreoffice-evolution.lintian-overrides | 1 -
libreoffice-gnome.lintian-overrides | 1 -
libreoffice-impress.lintian-overrides | 1 -
libreoffice-kde.lintian-overrides | 1 -
libreoffice-math.lintian-overrides | 1 -
libreoffice-officebean.lintian-overrides | 2 -
libreoffice-ogltrans.lintian-overrides | 1 -
libreoffice-report-builder-bin.lintian-overrides | 1 -
libreoffice-writer.lintian-overrides | 1 -
patches/mdds-1.2.0.diff | 144 +++++++++++++++++++++++
patches/series | 1 +
rules | 4 +-
tests/control | 2 +-
ure.lintian-overrides | 2 -
21 files changed, 153 insertions(+), 21 deletions(-)
diff --cc changelog
index e4ff4bb,d5c85bb..700f160
--- a/changelog
+++ b/changelog
@@@ -12,13 -6,47 +12,18 @@@ libreoffice (1:5.2.0~beta1~git20160513-
to /usr/include since -isystem /usr/include makes the stuff FTBFS
(closes: #823145)
+ * debian/*.lintian-overrides: remove obsolete
+ binary-or-shlib-defines-rpath and no-debconf-config overrides
+
- * debian/patches/mdds-1.2.0.diff: backport patch to build with mdds 1.2
- from master
- * debian/rules:
- - bump libmdds-dev and liborcus-dev build-deps and update orcus handling
- - fix another warning for !gcj builds: only try to set GCJ_JAWT_DIR if
- GCJ_JAWT_DEPENDS is set
-
- -- Rene Engelhard <r...@debian.org> Sat, 14 May 2016 00:18:49 +0200
-
-libreoffice (1:5.1.3~rc2-3) unstable; urgency=medium
-
* debian/rules:
- - sigh. revert control changes for now, needs more work, apparently..
-
- -- Rene Engelhard <r...@debian.org> Sun, 08 May 2016 08:31:54 +0200
-
-libreoffice (1:5.1.3~rc2-2) unstable; urgency=medium
-
- [ Mattia Rizzolo ]
- * debian/control.in: use nowdays canonical URIs in Vcs-*
-
- [ Rene Engelhard ]
- * debian/rules:
- - remove explicit $(MAKE) -f debian/rules control
-
- -- Rene Engelhard <r...@debian.org> Sun, 08 May 2016 00:16:51 +0200
-
-libreoffice (1:5.1.3~rc2-1) unstable; urgency=medium
-
- * New upstream release candidate
-
- * debian/rules:
- - print error in control without gcj-jdk installed
- don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset
+ - add initial build profile support: nodoc and nocheck
- disable the tests on kfreebsd-* (see #801865),
- move hardcoded (!)kfreebsd-i386 (!)kfreebsd-amd64 to (!)kfreebsd-any.
Use linux-any instead of just disabling it for kfreebsd for
libbbluetooth-dev B-D; reflects the sense better
++ - fix another warning for !gcj builds: only try to set GCJ_JAWT_DIR if
++ GCJ_JAWT_DEPENDS is set
-- Rene Engelhard <r...@debian.org> Thu, 05 May 2016 22:46:40 +0200
diff --cc patches/series
index 07f22ef,5273052..134c872
--- a/patches/series
+++ b/patches/series
@@@ -28,5 -29,11 +28,6 @@@ hppa-is-32bit.dif
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
-disable-npapi-plugin-support.diff
-gcc-6.diff
-bash-completion-dir.diff
-OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
-liborcus-0.11.diff
kde4-cflags-no-usr-include.diff
+ mdds-1.2.0.diff
diff --cc tests/control
index 8089711,aa23265..5f2df7a
--- 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, 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, 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, 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~ [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
