This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit 262e7607ef3bf7879595a1e18d073104b060e4f4 Author: Rene Engelhard <[email protected]> Date: Tue May 3 01:04:15 2016 +0200 Use linux-any instead of just disabling it for kfreebsd for libbbluetooth-dev B-D; reflects the sense better --- changelog | 6 ++++-- control | 2 +- rules | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changelog b/changelog index 5904353..4ef1312 100644 --- a/changelog +++ b/changelog @@ -3,8 +3,10 @@ libreoffice (1:5.1.3~rc1-2) UNRELEASED; urgency=medium * debian/rules: - print error in control without gcj-jdk installed - don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset - - disable the tests on kfreebsd-* (see #801865), move hardcoded - (!)kfreebsd-i386 (!)kfreebsd-amd64 to (!)kfreebsd-any + - 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 -- Rene Engelhard <[email protected]> Tue, 03 May 2016 00:01:09 +0200 diff --git a/control b/control index 12c778b..3b75c7d 100644 --- a/control +++ b/control @@ -42,7 +42,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64], libabw-dev (>= 0.1), libarchive-zip-perl, libavahi-client-dev, - libbluetooth-dev [!kfreebsd-any], + libbluetooth-dev [linux-any], libboost-date-time-dev (>= 1.58), libboost-dev (>= 1.58), libboost-filesystem-dev (>= 1.58), diff --git a/rules b/rules index e4e77c1..a205798 100755 --- a/rules +++ b/rules @@ -235,7 +235,7 @@ COINUTILS_MINVER= endif USE_DBUS=y ifeq "$(USE_DBUS)" "y" - ifneq (,$(findstring kfreebsd,$(DEB_HOST_ARCH))) + ifeq (,$(findstring linux,$(DEB_HOST_ARCH_OS))) ENABLE_BLUETOOTH=n else ENABLE_BLUETOOTH=y @@ -1448,7 +1448,7 @@ ifeq "$(USE_DBUS)" "y" CONFIGURE_FLAGS += --enable-dbus ifeq "$(ENABLE_BLUETOOTH)" "y" ifneq (,$(filter bluez, $(SYSTEM_STUFF))) - BUILD_DEPS += , libbluetooth-dev [!kfreebsd-any] + BUILD_DEPS += , libbluetooth-dev [linux-any] endif else CONFIGURE_FLAGS += --disable-sdremote-bluetooth @@ -1899,7 +1899,9 @@ ifeq "$(BUILD_KDE)" "y" endif ifeq "$(USE_DBUS)" "y" + ifeq "$(ENABLE_BLUETOOTH)" "y" perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control/' debian/control + endif perl -pi -e 's/Description: office productivity suite -- presentation/Suggests: bluez\nDescription: office productivity suite -- presentation/' debian/control endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
