[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.2_rc1-1-54-g7797aed

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

The following commit has been merged in the debian-experimental-3.7 branch:
commit ba882a70e43ad513414da573a7db86b218e09523
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Sep 27 21:01:30 2012 +0200

    git update; add conditionals for new (u)cpp requirement

diff --git a/changelog b/changelog
index e146915..2732c06 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.7.0~alpha0~git20120919-1) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20120927-1) UNRELEASED; urgency=low
 
   * new upstream snapshot
     - contains new driver for mozab (mork). Automatically enabled thus
diff --git a/control b/control
index a71ca40..e1a4218 100644
--- a/control
+++ b/control
@@ -3231,7 +3231,7 @@ Description: office productivity suite -- debug symbols
 Package: libreoffice-dev
 Section: devel
 Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${idlc-cpp-depends}
 Recommends: dmake, g++, ${java-runtime-depends}, ${java-common-depends}
 Suggests: libreoffice-dev-doc, libmythes-dev, c-shell
 Description: office productivity suite -- SDK
diff --git a/control.sdk.in b/control.sdk.in
index 596ac64..a3f3bdc 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -3,7 +3,8 @@ Section: devel
 Architecture: %OOO_ARCHS%
 Depends: libreofficeVER-core (= ${binary:Version}),
  ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends},
+ ${idlc-cpp-depends}
 Recommends: dmake,
  g++,
  ${java-runtime-depends},
diff --git a/rules b/rules
index 3c7109a..bfb647b 100755
--- a/rules
+++ b/rules
@@ -34,6 +34,7 @@ include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/vendor.mk
 DISTREL := $(shell lsb_release -cs)
 SHELL:=/bin/bash
+export gb_SHELL:=$(SHELL)
 
 SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
 
@@ -322,6 +323,10 @@ FAKEROOT_LIBDIR=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
 ENABLE_TELEPATHY=y
 SYSTEM_STUFF += liblangtag
 SYSTEM_STUFF += orcus
+USE_UCPP=n
+ifeq "$(USE_UCPP)" "y"
+  SYSTEM_STUFF += ucpp
+endif
 
 # Default flags to pass to configure
 CONFIGURE_FLAGS= \
@@ -887,6 +892,15 @@ endif
 ifeq "$(USE_SYSTEM_DMAKE)" "y"
 	BUILD_DEPS += , dmake (>= 1:4.11)
 endif
+ifeq "$(USE_UCPP)" "y"
+  ifneq (,$(filter ucpp, $(SYSTEM_STUFF)))
+	IDLC_CPP_DEPENDS := ucpp
+	BUILD_DEPS += , $(UCPP_DEPENDS)
+  endif
+else
+	IDLC_CPP_DEPENDS := cpp
+	CONFIGURE_FLAGS += --with-idlc-cpp=cpp
+endif
 
 ifneq (,$(filter hunspell, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
@@ -2944,6 +2958,7 @@ endif
 		-V'lpsolve-dep=$(LPSOLVE_DEP)' \
 		-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
 		-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
+		-V'idlc-cpp-depends=$(IDLC_CPP_DEPENDS)' \
 		-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
 		-v$(BINARY_VERSION)
 ifeq "$(ENABLE_JAVA)" "y"

-- 
LibreOffice packaging repository