[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.2_rc1-1-40-g6530f45
The following commit has been merged in the debian-experimental-3.7 branch:
commit 6530f45c8e9469f2b244b4ed6b5d75ceb4896bf2
Author: Rene Engelhard <rene@debian.org>
Date: Tue Sep 18 16:28:27 2012 +0200
enable system-mspub; add system-bluez support and don't build sdremote on kfreebsd
diff --git a/changelog b/changelog
index 642c3cf..7f81040 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,11 @@
-libreoffice (1:3.7.0~git20120917-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~git20120918-1) UNRELEASED; urgency=low
* new upstream snapshot
* debian/control.in:
- make -impress suggest bluez (for impress remote control)
+ * debian/rules:
+ - enable sdrmeote on all linux archs; b-d on libbluetooth-dev on those
-- Rene Engelhard <rene@debian.org> Fri, 20 Jul 2012 11:16:51 +0200
diff --git a/control b/control
index 914376f..b3c904b 100644
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, bc,, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7
.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.6.0), liborcus-dev, libvigraimpex-dev, libclucene-dev (>= 2.3.3.4-2), libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libcmis-dev (>= 0.3.0), liblcms2-dev, libldap2-dev, libtelepathy-glib-dev (>= 0.18), liblangtag-dev (>= 0.3), libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysqlclient-dev, l
ibmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2)
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl, gperf, bc,, gcc-4.4 [mips mipsel], g++-4.4 [mips mipsel], libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!alpha !armel !sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxml2-utils, libxslt1-dev, libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev, libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7
.2.3~), libcppunit-dev (>= 1.12), gdb, junit4 (>= 4.8.2-2), default-jdk, default-jdk (>= 1:1.7-48) [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), g++-mingw-w64-i686 [i386 amd64], javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libboost-date-time-dev (>= 1.38), libmdds-dev (>= 0.6.0), liborcus-dev, libvigraimpex-dev, libclucene-dev (>= 2.3.3.4-2), libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libvisio-dev, libcdr-dev, libmspub-dev, libcmis-dev (>= 0.3.0), liblcms2-dev, libldap2-dev, libtelepathy-glib-dev (>= 0.18), liblangtag-dev (>= 0.3), libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4:4.8), libmysq
lclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook1.2-dev, libpq-dev (>= 9.0~), libxrandr-dev, libhsqldb-java (>> 1.8.0.10), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext, make (>= 3.81-8.2)
Build-Depends-Indep: fdupes, xml-core, imagemagick, doxygen, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, libbase-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>= 0.9.4) [!hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>= 0.2.10) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java (>= 1.1.1-9), libservlet2.5-java, bsh (>= 2.0b
4), fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11), gcc (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++ (>= 4:4.7~) [!i386 !amd64 !kfreebsd-i386 !kfreebsd-amd64], g++-4.7 (<< 4.7.1-3), base-files (= 7.0), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
diff --git a/patches/series b/patches/series
index f41dc74..8818af9 100644
--- a/patches/series
+++ b/patches/series
@@ -28,4 +28,3 @@ build-dont-run-checks.diff
#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
disable-flaky-unoapi-tests.diff
gcc-4.4.diff
-system-bluez.diff
diff --git a/patches/system-bluez.diff b/patches/system-bluez.diff
deleted file mode 100644
index fe6a615..0000000
--- a/patches/system-bluez.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 563bcdc..fcdd59b8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1576,6 +1576,11 @@ AC_ARG_WITH(system-sane,
- [Use sane.h already on system.]),,
- [with_system_sane="$with_system_headers"])
-
-+AC_ARG_WITH(system-bluez,
-+ AS_HELP_STRING([--with-system-bluez],
-+ [Use bluetooth.h already on system.]),,
-+ [with_system_bluez="$with_system_headers"])
-+
- AC_ARG_WITH(system-xextensions-headers,
- AS_HELP_STRING([--with-system-xextensions-headers],
- [To build without system X11 extensions headers, use
-@@ -8234,6 +8246,19 @@ else
- fi
-
- dnl ===================================================================
-+dnl Check for system bluez
-+dnl ===================================================================
-+AC_MSG_CHECKING([which bluetooth header to use])
-+if test "$with_system_bluez" = "yes"; then
-+ AC_MSG_RESULT([external])
-+ AC_CHECK_HEADER(bluetooth/bluetooth.h, [],
-+ [AC_MSG_ERROR(bluetooth.h not found. install bluez)], [])
-+else
-+ AC_MSG_RESULT([internal])
-+ BUILD_TYPE="$BUILD_TYPE BLUEZ"
-+fi
-+
-+dnl ===================================================================
- dnl Check for system icu
- dnl ===================================================================
- SYSTEM_GENBRK=
-diff --git a/sd/prj/build.lst b/sd/prj/build.lst
-index b4dc93d..b340431 100644
---- a/sd/prj/build.lst
-+++ b/sd/prj/build.lst
-@@ -1,3 +1,3 @@
--sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess NULL
-+sd sd : filter TRANSLATIONS:translations animations configmgr svx sfx2 stoc canvas embeddedobj LIBXSLT:libxslt oox ure test xmloff fileaccess unoxml dbaccess BLUEZ:bluez_bluetooth NULL
- sd sd usr1 - all sd_mkout NULL
- sd sd\prj nmake - all sd_prj NULL
-diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
-index 01adb96..ebfdd3c 100644
---- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
-+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
-@@ -14,8 +14,8 @@
- #include <dbus/dbus-glib.h>
- #include <sys/unistd.h>
- #include <sys/socket.h>
--#include "bluetooth/bluetooth.h"
--#include "bluetooth/rfcomm.h"
-+#include <bluetooth/bluetooth.h>
-+#include <bluetooth/rfcomm.h>
- #endif
-
- #ifdef WIN32
-diff --git a/Module_tail_build.mk b/Module_tail_build.mk
-index ec9e006..c2d6c5d 100644
---- a/Module_tail_build.mk
-+++ b/Module_tail_build.mk
-@@ -36,7 +36,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
- basic \
- bean \
- binaryurp \
-- bluez_bluetooth \
-+ $(if $(filter BLUEZ,$(BUILD_TYPE)),\
-+ bluez_bluetooth \
-+ ) \
- canvas \
- chart2 \
- configmgr \
diff --git a/rules b/rules
index dd7c19a..2cfe636 100755
--- a/rules
+++ b/rules
@@ -157,7 +157,7 @@ ICU_MINVER= (>= 4.0)
SYSTEM_STUFF += libwpd libwpg libwps
SYSTEM_STUFF += libvisio
SYSTEM_STUFF += libcdr
-#SYSTEM_STUFF += libmspub
+SYSTEM_STUFF += libmspub
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@ -195,6 +195,14 @@ SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
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
+ else
+ ENABLE_SDREMOTE=y
+# SYSTEM_STUFF += bluez
+ endif
+endif
USE_GSTREAMER=y
GSTREAMER_VERSION=0.10
SYSTEM_STUFF += neon
@@ -1127,6 +1135,11 @@ endif
ifeq "$(USE_DBUS)" "y"
BUILD_DEPS += , libdbus-glib-1-dev (>= 0.70)
CONFIGURE_FLAGS += --enable-dbus
+ ifeq "$(ENABLE_SDREMOTE)" "y"
+ ifneq (,$(filter bluez, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386]
+ endif
+ endif
endif
ifeq "$(USE_GSTREAMER)" "y"
--
LibreOffice packaging repository
Reply to: