[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
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 2b725fa33d6ac1a8c666aa5e657cfd61c0a78159
Merge: ce10aaa 7abe0fd
Author: Rene Engelhard <rene@debian.org>
Date: Sat May 21 18:45:52 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
changelog | 1 +
control | 2 +-
rules | 40 ++++++++++++++++++++--------------------
tests/control | 2 +-
4 files changed, 23 insertions(+), 22 deletions(-)
diff --cc changelog
index 8e4a3d4,e6d80f9..b91ba42
--- a/changelog
+++ b/changelog
@@@ -24,9 -62,6 +24,10 @@@ libreoffice (1:5.2.0~beta1~git20160513-
- 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
+ - move GTK3_MINVER setting down in rules so the conditional gets honoured
++ - migrate from --ddeb-migration to --dbgsym-migration
-- Rene Engelhard <rene@debian.org> Thu, 05 May 2016 22:46:40 +0200
diff --cc rules
index db30a19,8f65a7f..748fb09
--- a/rules
+++ b/rules
@@@ -196,15 -198,12 +196,15 @@@ QT_MINVER= (>= 4:4.8
KDELIBS_MINVER= (>= 4:4.3.4)
BUILD_DBG_PACKAGE=n
ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
- BUILD_DDEBS=y
+ BUILD_DBGSYM_PACKAGES=y
endif
- ifeq "$(BUILD_DDEBS)$(BUILD_DBG_PACKAGE)" "yy"
- $(error only either DDEBS or -dbg allowed)
+ ifeq "$(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE)" "yy"
+ $(error only either -dbgsym or -dbg allowed)
endif
+# this changes the packages' built/contents of packages (-subsequentcheckbase)
+# This is not exactly allowed in policy but it doesn't have real practical difference,
+# does it?
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
BUILD_TEST_PACKAGE=y
endif
@@@ -696,8 -694,10 +696,8 @@@ ifeq "$(shell dpkg-parsechangelog | gre
SYSTEM_STUFF := $(filter-out opencollada collada2gltf libcmis mdds glm orcus libgltf libwps,$(SYSTEM_STUFF))
JESSIE_BACKPORT=y
BUILD_DBG_PACKAGE=y
- BUILD_DDEBS=n
+ BUILD_DBGSYM_PACKAGES=n
PYTHON_SIX_RECOMMENDS = python-six
- MDDS_VER := 0.1
- LIBORCUS_MINVER :=
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
BUGS=mailto:debian-openoffice@lists.debian.org
diff --cc tests/control
index 5f2df7a,d7e8e65..82ecbc9
--- 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
Reply to: