[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc1-1-72-ge313242

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.7 branch:
commit e3132423922781113726f3a47644f09e84c9d144
Author: Rene Engelhard <rene@debian.org>
Date:   Sun Oct 21 23:05:37 2012 +0200

    update conditionals to always enable sdremote; disable just bluetooth on kfreebsd - as upstream supports that now

diff --git a/changelog b/changelog
index e3c9624..9d6c805 100644
--- a/changelog
+++ b/changelog
@@ -9,7 +9,10 @@ libreoffice (1:3.7.0~alpha0~git20121021-1) UNRELEASED; urgency=low
   * debian/rules:
     - disable langpacks for now; translations not yet updated causing
       weird stuff
-    - enable sdrmeote on all linux archs; b-d on libbluetooth-dev on those
+    - add new conditionals for new dependencies: liblangtag, liborcus,
+      libmspub, (u)cpp
+    - enable sdrmeote on all archs; b-d on libbluetooth-dev on where we
+      enable bluetooth (!kfreebsd-*)
     - use gstreamer1.0
   * debian/uno-libs3.symbols: update
 
diff --git a/rules b/rules
index c040731..b448e17 100755
--- a/rules
+++ b/rules
@@ -198,9 +198,9 @@ LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
 USE_DBUS=y
 ifeq "$(USE_DBUS)" "y"
   ifneq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
-    ENABLE_SDREMOTE=n
+    ENABLE_BLUETOOTH=n
   else
-    ENABLE_SDREMOTE=y
+    ENABLE_BLUETOOTH=y
     SYSTEM_STUFF += bluez
   endif
 endif
@@ -1141,7 +1141,7 @@ endif
 ifeq "$(USE_DBUS)" "y"
 	BUILD_DEPS += , libdbus-glib-1-dev (>= 0.70)
 	CONFIGURE_FLAGS += --enable-dbus
-  ifeq "$(ENABLE_SDREMOTE)" "y"
+  ifeq "$(ENABLE_BLUETOOTH)" "y"
     ifneq (,$(filter bluez, $(SYSTEM_STUFF)))
        BUILD_DEPS += , libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386]
     endif

-- 
LibreOffice packaging repository