[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.1-1-30-ge686bf3
The following commit has been merged in the debian-experimental-3.7 branch:
commit e686bf351da2720a94dab222a30d85c5f58fdf9b
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 6 18:46:46 2012 +0200
add bluez info only when dbus enabled
diff --git a/control b/control
index ef60f5a..0096c8d 100644
--- a/control
+++ b/control
@@ -60,8 +60,8 @@ Description: office productivity suite
* gstreamer0.10-plugins-*: GStreamer plugins for use with LibreOffices
media backend
* libpaper-utils: papersize detection support via paperconf
+ * bluez: Bluetooth support for Impress (slideshow remote control
* libreoffice-filter-binfilter: legacy filters (e.g. StarOffice 5.2)
- * bluez: Bluetooth support for Impress (slideshow remote control)
Package: libreoffice-l10n-za
Section: metapackages
diff --git a/control.in b/control.in
index 151dc78..b56cef3 100644
--- a/control.in
+++ b/control.in
@@ -123,7 +123,6 @@ Description: office productivity suite
media backend
* libpaper-utils: papersize detection support via paperconf
* libreofficeVER-filter-binfilter: legacy filters (e.g. StarOffice 5.2)
- * bluez: Bluetooth support for Impress (slideshow remote control)
Package: libreofficeVER-l10n-za
Section: metapackages
@@ -278,7 +277,6 @@ Depends: libreofficeVER-core (= ${binary:Version}),
libreofficeVER-draw (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Suggests: bluez
Description: office productivity suite -- presentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/rules b/rules
index 27de722..77c6a90 100755
--- a/rules
+++ b/rules
@@ -1520,6 +1520,11 @@ ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/GConf backend$$/GConf backend\n * libreoffice$(VER)-kde: KDE UI Plugin and KDE File Picker support/' debian/control
endif
+ifeq "$(USE_DBUS)" "y"
+ perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control/' debian/control
+ perl -pi -e 's/Description: office productivity suite -- presentation/Suggests: bluez\nDescription: office productivity suite -- presentation/' debian/control
+endif
+
ifneq "$(DICT_DIR)" "/usr/share/hunspell"
perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control
endif
--
LibreOffice packaging repository
Reply to: