[libreoffice] 01/01: bump libmysqlcppconn-dev build-dep to it's gcc 5 rebuild
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 97f60ba0b9a9fb02797993f081754794080b3631
Author: Rene Engelhard <rene@debian.org>
Date: Thu Aug 13 10:50:46 2015 +0200
bump libmysqlcppconn-dev build-dep to it's gcc 5 rebuild
---
changelog | 7 +++++++
control | 4 ++--
rules | 4 ++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 4e91060..8e728b5 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - bump libmysqlcppconn-dev build-dep to it's gcc 5 rebuild
+
+ -- Rene Engelhard <rene@debian.org> Wed, 12 Aug 2015 15:23:58 +0200
+
libreoffice (1:5.0.1~rc1-2) unstable; urgency=medium
* debian/patches/series: (re-)enable disable-tiledrendering-test.diff;
diff --git a/control b/control
index de40381..5dbac5a 100644
--- a/control
+++ b/control
@@ -90,7 +90,7 @@ Build-Depends: ant (>= 1.7.0),
libmspub-dev (>= 0.1),
libmwaw-dev (>= 0.3.5),
libmysqlclient-dev,
- libmysqlcppconn-dev (>= 1.1.0~r791),
+ libmysqlcppconn-dev (>= 1.1.3-7),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
@@ -4438,7 +4438,7 @@ Depends: ant (>= 1.7.0),
libmspub-dev (>= 0.1),
libmwaw-dev (>= 0.3.5),
libmysqlclient-dev,
- libmysqlcppconn-dev (>= 1.1.0~r791),
+ libmysqlcppconn-dev (>= 1.1.3-7),
libmythes-dev (>= 2:1.2),
libneon27-gnutls-dev,
libnss3-dev (>= 3.12.3),
diff --git a/rules b/rules
index 3a3b018..aa9093d 100755
--- a/rules
+++ b/rules
@@ -401,7 +401,11 @@ USE_MARIADB=n
# set this also to y for system-mysql..
SYSTEM_STUFF += mariadb
SYSTEM_STUFF += mysql-cppconn
+ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
+MYSQLCPPCONN_MINVER= (>= 1.1.3-7)
+else
MYSQLCPPCONN_MINVER= (>= 1.1.0~r791)
+endif
SYSTEM_STUFF += postgresql
DICT_DIR=/usr/share/hunspell
HYPH_DIR=/usr/share/hyphen
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: