This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.4
in repository libreoffice.
commit f05b791328adb3ee3c103ab974f168e5bdbdcc3c
Author: Rene Engelhard <r...@debian.org>
Date: Tue Oct 28 00:08:25 2014 +0100
use libmariadb-client-lgpl-dev instead of libmariadbclient-dev when
USE_MARIADB=y
---
changelog | 4 +++-
rules | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 44159c0..280cd19 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,11 @@
-libreoffice (1:4.4.0~beta1~git20141023-1) UNRELEASED; urgency=medium
+libreoffice (1:4.4.0~beta1~git20141027-1) UNRELEASED; urgency=medium
* new upstream snapshot
* debian/rules:
- add conditional/includes/libs for system-opencollada
+ - use libmariadb-client-lgpl-dev instead of libmariadbclient-dev
+ when USE_MARIADB=y
-- Rene Engelhard <r...@debian.org> Mon, 20 Oct 2014 18:46:46 +0200
diff --git a/rules b/rules
index a6231b3..f7aef10 100755
--- a/rules
+++ b/rules
@@ -1199,7 +1199,7 @@ ifeq "$(ENABLE_MYSQLNATIVE)" "y"
MARIADBCONFIG=/usr/bin/mysql_config
else
ifneq (,$(filter mariadb, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmariadbclient-dev (>= 1.1.0~)
+ BUILD_DEPS += , libmariadb-client-lgpl-dev
endif
MARIADBCONFIG=/usr/bin/mariadb_config
endif
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/libreoffice.git
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xjasd-0007qd...@moszumanska.debian.org
