[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-85-g67a718a

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

The following commit has been merged in the debian-experimental-4.1 branch:
commit fc5a1b968d935711e41e9d80879692d51f2099cf
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Mar 14 23:54:55 2013 +0100

    fix build with internal mariab (and mysqlcppconn)

diff --git a/changelog b/changelog
index fd9821d..db5b2fc 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.1.0~alpha1~git20130313-1) UNRELEASED; urgency=low
+libreoffice (1:4.1.0~alpha1~git20130314-1) UNRELEASED; urgency=low
 
   * new upstream snapshot
 
diff --git a/patches/build-dont-run-checks.diff b/patches/build-dont-run-checks.diff
index 1abdaf8..fbe5e1f 100644
--- a/patches/build-dont-run-checks.diff
+++ b/patches/build-dont-run-checks.diff
@@ -12,7 +12,7 @@ Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243
  3 files changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
-index 0e694e5..48b25ac 100644
+index 68c171f..eadfb3c 100644
 --- a/solenv/gbuild/Module.mk
 +++ b/solenv/gbuild/Module.mk
 @@ -92,7 +92,7 @@ $(call gb_Module_get_target,%) :
@@ -22,8 +22,8 @@ index 0e694e5..48b25ac 100644
 -all : build $(if $(CROSS_COMPILING),,unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck))
 +all : build
  
- build : 
- 	$(call gb_Output_announce,top level modules: $(foreach module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir $(module))),$(true),ALL,6)
+ build-tools : $(gb_BUILD_TOOLS)
+ 	$(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6)
 diff --git a/Makefile.in b/Makefile.in
 index 53ec395..fdc2fb7 100644
 --- a/Makefile.in
diff --git a/patches/mysqlcppconn-libmysqlclient-SONAME.diff b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
index 5d8b78e..0f7648f 100644
--- a/patches/mysqlcppconn-libmysqlclient-SONAME.diff
+++ b/patches/mysqlcppconn-libmysqlclient-SONAME.diff
@@ -27,14 +27,14 @@ index f71e3a3..4abbf57 100644
 + 
 + template<typename FunctionType>
 diff --git a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk b/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
-index 542c384..0b58f14 100644
+index 3f86236..f75b60a 100644
 --- a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
 +++ b/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
-@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
+@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_file,mysqlcppconn,driver/nativeapi/binding_
+ 
+ $(eval $(call gb_UnpackedTarball_add_patches,mysqlcppconn,\
  	mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch \
- 	$(if $(filter NO,$(SYSTEM_MARIADB)), \
- 	mysqlcppconn/patches/mysql-connector-c++-1.1.0-mysql-binding-dynamic.patch) \
-+	mysql-connector-c++-1.1.0-SONAME.patch \
++	mysqlcppconn/patches/mysql-connector-c++-1.1.0-SONAME.patch \
  	mysqlcppconn/patches/default_to_protocol_tcp.patch \
  ))
  
diff --git a/rules b/rules
index e365f64..aad54d5 100755
--- a/rules
+++ b/rules
@@ -1036,13 +1036,11 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
   ifneq "$(USE_MARIADB)" "y"
     ifneq (,$(filter mysql-cppconn, $(SYSTEM_STUFF)))
         BUILD_DEPS += , libmysqlclient-dev
-    else
-        BUILD_DEPS += , libmysqlclient-dev (>= 5.5~)
     endif
      MARIADBCONFIG=/usr/bin/mysql_config
   else
     ifneq (,$(filter mariadb, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libmariadbclient-dev
+	BUILD_DEPS += , libmariadbclient-dev (>= 1.1.0~)
     endif
      MARIADBCONFIG=/usr/bin/mariadb_config
   endif

-- 
LibreOffice packaging repository