[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.3-2-119-gb5c40a8

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

The following commit has been merged in the debian-experimental-4.1 branch:
commit b5c40a838fb5fea565c7fea7d79434f4d3166024
Author: Rene Engelhard <rene@debian.org>
Date:   Sat May 18 18:30:14 2013 +0200

    build-conflict agianst libmariadbclient-dev when building with MySQL

diff --git a/control b/control
index 89cc750..2c7344b 100644
--- a/control
+++ b/control
@@ -156,6 +156,7 @@ Build-Conflicts: ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
                  libc6-dev (= 2.6.1-3) [i386 amd64],
                  libc6-dev (= 2.6.1-4) [i386 amd64],
                  libcairo2 (= 1.4.8-1),
+                 libmariadbclient-dev,
                  libxul-dev (= 1.8.0.13~pre070720-0etch1),
                  nvidia-glx-dev,
                  nvidia-glx-legacy-dev,
diff --git a/rules b/rules
index 963ea23..a84d853 100755
--- a/rules
+++ b/rules
@@ -1584,6 +1584,10 @@ ifeq "$(WHEEZY_BACKPORT)" "y"
   endif
 endif
 
+ifneq "$(USE_MARIADB)" "y"
+	perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
+endif
+
 ifeq (4.4,$(SYSTEM_GCC_VERSION))
 	perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
 endif

-- 
LibreOffice packaging repository