[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.4_rc1-1-109-gec2a908



The following commit has been merged in the debian-experimental-3.7 branch:
commit ec2a908e124f493b8aa902c4e00c0603f81a99c8
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Nov 16 15:01:51 2012 +0100

    actually set -disable-sdremote-bluetooth

diff --git a/changelog b/changelog
index aada87c..6dba38e 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.0~alpha0~git20121115-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha0~git20121116-1) UNRELEASED; urgency=low
 
   * new upstream snapshot
     - contains new driver for mozab (mork). Automatically enabled thus
diff --git a/rules b/rules
index 61b8a3a..9566fb5 100755
--- a/rules
+++ b/rules
@@ -1119,6 +1119,8 @@ ifeq "$(USE_DBUS)" "y"
     ifneq (,$(filter bluez, $(SYSTEM_STUFF)))
        BUILD_DEPS += , libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386]
     endif
+  else
+	CONFIGURE_FLAGS += --disable-sdremote-bluetooth
   endif
 endif
 

-- 
LibreOffice packaging repository


Reply to: