[arch-commits] Commit in (16 files)
Christian Hesse
eworm at archlinux.org
Wed May 31 11:21:28 UTC 2017
Date: Wednesday, May 31, 2017 @ 11:21:27
Author: eworm
Revision: 296930
ditch mariadb 10.2.x, keep mariadb 10.1.x with old package names
Modified:
apr-util/trunk/PKGBUILD
cyrus-sasl/trunk/PKGBUILD
gnucash/trunk/PKGBUILD
kdb/trunk/PKGBUILD
kexi/trunk/PKGBUILD
libgda/trunk/PKGBUILD
libsasl/trunk/PKGBUILD
lighttpd/trunk/PKGBUILD
mysql-python/trunk/PKGBUILD
perl-dbd-mysql/trunk/PKGBUILD
postfix/trunk/PKGBUILD
qt4/trunk/PKGBUILD
qt5-base/trunk/PKGBUILD
redland/trunk/PKGBUILD
ulogd/trunk/PKGBUILD
zabbix/trunk/PKGBUILD
-------------------------------+
apr-util/trunk/PKGBUILD | 4 ++--
cyrus-sasl/trunk/PKGBUILD | 6 +++---
gnucash/trunk/PKGBUILD | 2 +-
kdb/trunk/PKGBUILD | 4 ++--
kexi/trunk/PKGBUILD | 2 +-
libgda/trunk/PKGBUILD | 4 ++--
libsasl/trunk/PKGBUILD | 8 ++++----
lighttpd/trunk/PKGBUILD | 4 ++--
mysql-python/trunk/PKGBUILD | 2 +-
perl-dbd-mysql/trunk/PKGBUILD | 2 +-
postfix/trunk/PKGBUILD | 2 +-
qt4/trunk/PKGBUILD | 4 ++--
qt5-base/trunk/PKGBUILD | 4 ++--
redland/trunk/PKGBUILD | 10 +++++-----
ulogd/trunk/PKGBUILD | 4 ++--
zabbix/trunk/PKGBUILD | 8 ++++----
16 files changed, 35 insertions(+), 35 deletions(-)
Modified: apr-util/trunk/PKGBUILD
===================================================================
--- apr-util/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ apr-util/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -9,12 +9,12 @@
arch=('i686' 'x86_64')
url="http://apr.apache.org/"
depends=('apr' 'expat')
-makedepends=('gdbm' 'libldap' 'unixodbc' 'openssl' 'nss' 'sqlite' 'libmariadb' 'db' 'postgresql-libs' 'python2')
+makedepends=('gdbm' 'libldap' 'unixodbc' 'openssl' 'nss' 'sqlite' 'libmariadbclient' 'db' 'postgresql-libs' 'python2')
optdepends=(
'gdbm: enable gdbm support'
'libldap: enable ldap support'
'unixodbc: enable odbc support'
- 'libmariadb: enable mysql/mariadb support'
+ 'libmariadbclient: enable mysql/mariadb support'
'postgresql-libs: enable postgres support'
'db: enable berkley db support'
'sqlite: enable sqlite support'
Modified: cyrus-sasl/trunk/PKGBUILD
===================================================================
--- cyrus-sasl/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ cyrus-sasl/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
-# This package spans multiple repositories.
+# This package spans multiple repositories.
# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
pkgbase=('cyrus-sasl')
@@ -14,7 +14,7 @@
url="http://cyrusimap.web.cmu.edu/"
license=('custom')
options=('!makeflags')
-makedepends=('postgresql-libs' 'libmariadb' 'libldap' 'krb5' 'openssl' 'sqlite')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite')
source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
cyrus-sasl-2.1.22-qa.patch
cyrus-sasl-2.1.26-size_t.patch
@@ -63,7 +63,7 @@
patch -Np1 -i ../cyrus-sasl-2.1.27-openssl-1.1.0.patch
patch -Np1 -i ../fix-pkgconfig.patch
- sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 's/libmysqlclient.a/libmariadb.so/' -i configure.in
+ sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 's/libmysqlclient.a/libmysqlclient.so/' -i configure.in
}
build() {
Modified: gnucash/trunk/PKGBUILD
===================================================================
--- gnucash/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ gnucash/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -9,7 +9,7 @@
arch=('i686' 'x86_64')
url="http://www.gnucash.org"
license=("GPL")
-depends=('guile2.0' 'slib' 'goffice0.8' 'libdbi-drivers' 'libmariadb' 'postgresql-libs' 'aqbanking' 'desktop-file-utils' 'webkitgtk2' 'libgnome-keyring' 'libgnomecanvas' 'dconf')
+depends=('guile2.0' 'slib' 'goffice0.8' 'libdbi-drivers' 'libmariadbclient' 'postgresql-libs' 'aqbanking' 'desktop-file-utils' 'webkitgtk2' 'libgnome-keyring' 'libgnomecanvas' 'dconf')
makedepends=('intltool' 'gcc' 'pkgconfig')
optdepends=('evince: for print preview'
'yelp: help browser'
Modified: kdb/trunk/PKGBUILD
===================================================================
--- kdb/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ kdb/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -9,8 +9,8 @@
url="http://www.kexi-project.org/"
license=(GPL2)
depends=(kcoreaddons)
-makedepends=(extra-cmake-modules python2 libmariadb postgresql qt5-tools)
-optdepends=('libmariadb: MySQL plugin' 'postgresql: PostgreSQL plugin')
+makedepends=(extra-cmake-modules python2 libmariadbclient postgresql qt5-tools)
+optdepends=('libmariadbclient: MySQL plugin' 'postgresql: PostgreSQL plugin')
source=("http://download.kde.org/stable/$pkgname/src/$pkgname-$pkgver.tar.xz"{,.sig})
sha1sums=('eb36afc210d8882e318ea2acb4ed6d02211535e3'
'SKIP')
Modified: kexi/trunk/PKGBUILD
===================================================================
--- kexi/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ kexi/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -9,7 +9,7 @@
url="http://www.kexi-project.org/"
license=(GPL2)
depends=(kdb kreport ktexteditor breeze-icons)
-makedepends=(extra-cmake-modules python qt5-tools marble-common libmariadb postgresql qt5-webkit)
+makedepends=(extra-cmake-modules python qt5-tools marble-common libmariadbclient postgresql qt5-webkit)
optdepends=('qt5-webkit: Web browser plugin')
conflicts=(calligra-kexi)
replaces=(calligra-kexi)
Modified: libgda/trunk/PKGBUILD
===================================================================
--- libgda/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ libgda/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -10,7 +10,7 @@
arch=(i686 x86_64)
license=(GPL)
depends=(gtksourceview3 libxslt python2 libsecret graphviz goocanvas iso-codes)
-makedepends=(glade libmariadb postgresql-libs libfbclient jdk8-openjdk intltool
+makedepends=(glade libmariadbclient postgresql-libs libfbclient jdk8-openjdk intltool
gobject-introspection gtk-doc vala itstool gnome-common git)
_commit=2ea3179bad2e414ff6068db2249116eb6e2564a5 # tags/LIBGDA_5_2_4^0
source=("git+https://git.gnome.org/browse/libgda#commit=$_commit"
@@ -97,7 +97,7 @@
package_libgda-mysql() {
pkgdesc="libgda provider for MySQL"
- depends=(libgda libmariadb)
+ depends=(libgda libmariadbclient)
_packageprovider mysql
}
Modified: libsasl/trunk/PKGBUILD
===================================================================
--- libsasl/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ libsasl/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
-# This package spans multiple repositories.
+# This package spans multiple repositories.
# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
#pkgbase=('cyrus-sasl')
@@ -14,7 +14,7 @@
url="http://cyrusimap.web.cmu.edu/"
license=('custom')
options=('!makeflags')
-makedepends=('postgresql-libs' 'libmariadb' 'libldap' 'krb5' 'openssl' 'sqlite')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite')
source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
cyrus-sasl-2.1.22-qa.patch
cyrus-sasl-2.1.26-size_t.patch
@@ -63,7 +63,7 @@
patch -Np1 -i ../cyrus-sasl-2.1.27-openssl-1.1.0.patch
patch -Np1 -i ../fix-pkgconfig.patch
- sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 's/libmysqlclient.a/libmariadb.so/' -i configure.in
+ sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -e 's/libmysqlclient.a/libmysqlclient.so/' -i configure.in
}
build() {
@@ -191,7 +191,7 @@
package_cyrus-sasl-sql() {
pkgdesc="SQL auxprop module for Cyrus SASL"
- depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadb' 'sqlite')
+ depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite')
replaces=('cyrus-sasl-plugins')
cd cyrus-sasl-$pkgver/plugins
Modified: lighttpd/trunk/PKGBUILD
===================================================================
--- lighttpd/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ lighttpd/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -9,10 +9,10 @@
arch=('i686' 'x86_64')
url="http://www.lighttpd.net/"
depends=('pcre' 'util-linux' 'systemd')
-makedepends=('libmariadb' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
+makedepends=('libmariadbclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
optdepends=('libxml2: mod_webdav'
'lua: mod_cml/mod_magnet'
- 'libmariadb: mod_mysql_vhost/mod_authn_mysql'
+ 'libmariadbclient: mod_mysql_vhost/mod_authn_mysql'
'sqlite: mod_webdav')
backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
options=('emptydirs')
Modified: mysql-python/trunk/PKGBUILD
===================================================================
--- mysql-python/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ mysql-python/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -10,7 +10,7 @@
arch=("i686" "x86_64")
url="http://mysql-python.sourceforge.net/"
license=('GPL2')
-depends=('python2' 'libmariadb')
+depends=('python2' 'libmariadbclient')
makedepends=('python2-setuptools')
source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip")
md5sums=('654f75b302db6ed8dc5a898c625e030c')
Modified: perl-dbd-mysql/trunk/PKGBUILD
===================================================================
--- perl-dbd-mysql/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ perl-dbd-mysql/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -11,7 +11,7 @@
arch=('i686' 'x86_64')
license=('GPL' 'PerlArtistic')
url="http://search.cpan.org/dist/DBD-mysql/"
-depends=('libmariadb' 'perl-dbi')
+depends=('libmariadbclient' 'perl-dbi')
checkdepends=('mariadb' 'perl-test-deep')
options=('!emptydirs')
source=(http://search.cpan.org/CPAN/authors/id/M/MI/MICHIELB/DBD-mysql-${pkgver}.tar.gz)
Modified: postfix/trunk/PKGBUILD
===================================================================
--- postfix/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ postfix/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -11,7 +11,7 @@
license=('custom')
arch=('i686' 'x86_64')
depends=('openssl' 'pcre' 'icu' 'libsasl' 'libldap' 'db'
- 'libmariadb' 'postgresql-libs' 'sqlite' 'tinycdb')
+ 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"
'aliases.patch'
'service')
Modified: qt4/trunk/PKGBUILD
===================================================================
--- qt4/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ qt4/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -12,10 +12,10 @@
pkgdesc='A cross-platform application and UI framework'
depends=('sqlite' 'ca-certificates' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng' 'dbus')
-makedepends=('postgresql-libs' 'libmariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
+makedepends=('postgresql-libs' 'libmariadbclient' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('postgresql-libs: PostgreSQL driver'
- 'libmariadb: MariaDB driver'
+ 'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
'libxinerama: Xinerama support'
Modified: qt5-base/trunk/PKGBUILD
===================================================================
--- qt5-base/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ qt5-base/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -14,11 +14,11 @@
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'xcb-util-renderutil' 'libgl' 'fontconfig'
'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
'tslib' 'libinput' 'libsm' 'libxkbcommon-x11' 'libproxy' 'libcups' 'openssl-1.0')
-makedepends=('libfbclient' 'libmariadb' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
+makedepends=('libfbclient' 'libmariadbclient' 'sqlite' 'unixodbc' 'postgresql-libs' 'alsa-lib' 'gst-plugins-base-libs'
'gtk3' 'libpulse' 'cups' 'freetds')
optdepends=('qt5-svg: to use SVG icon themes'
'postgresql-libs: PostgreSQL driver'
- 'libmariadb: MariaDB driver'
+ 'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver'
'libfbclient: Firebird/iBase driver'
'freetds: MS SQL driver'
Modified: redland/trunk/PKGBUILD
===================================================================
--- redland/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ redland/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Tom Gundersen <teg at jklm.no>
# Contributor: AndyRTR <andyrtr at archlinux.org>
-# Contributor: Francois Charette <francois.archlinux.org>
+# Contributor: Francois Charette <francois.archlinux.org>
pkgbase=redland
epoch=1
@@ -12,7 +12,7 @@
url="http://librdf.org/"
license=("GPL")
arch=('i686' 'x86_64')
-makedepends=('rasqal' 'raptor' 'postgresql-libs' 'libmariadb' 'unixodbc' 'sqlite')
+makedepends=('rasqal' 'raptor' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
rpath.diff)
sha256sums=('de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681'
@@ -39,7 +39,7 @@
package_redland() {
pkgdesc="Library that provides a high-level interface to RDF data"
depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libltdl')
-
+
cd "${srcdir}/${pkgbase}-${pkgver}"
make DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}/usr/lib/redland"
@@ -47,7 +47,7 @@
package_redland-storage-mysql() {
pkgdesc="MySQL storage support for Redland"
- depends=('redland' 'libmariadb')
+ depends=('redland' 'libmariadbclient')
cd "${srcdir}/${pkgbase}-${pkgver}"
install -dm755 "${pkgdir}/usr/lib/redland"
@@ -75,7 +75,7 @@
package_redland-storage-sqlite() {
pkgdesc="SQLite storage support for Redland"
depends=('redland' 'sqlite3')
-
+
cd "${srcdir}/${pkgbase}-${pkgver}"
install -dm755 "${pkgdir}/usr/lib/redland"
install -m755 src/.libs/librdf_storage_sqlite.so "${pkgdir}/usr/lib/redland/"
Modified: ulogd/trunk/PKGBUILD
===================================================================
--- ulogd/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ ulogd/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -16,13 +16,13 @@
'libnetfilter_log'
'libnfnetlink')
backup=('etc/ulogd.conf')
-makedepends=('libmariadb'
+makedepends=('libmariadbclient'
'libpcap'
'libdbi'
'postgresql-libs'
'sqlite'
'jansson')
-optdepends=('libmariadb: MySQL databases support'
+optdepends=('libmariadbclient: MySQL databases support'
'sqlite: SQLite3 databases support'
'postgresql-libs: PostgreSQL databases support'
'libdbi: DBI abstraction databases support'
Modified: zabbix/trunk/PKGBUILD
===================================================================
--- zabbix/trunk/PKGBUILD 2017-05-31 11:02:35 UTC (rev 296929)
+++ zabbix/trunk/PKGBUILD 2017-05-31 11:21:27 UTC (rev 296930)
@@ -9,7 +9,7 @@
arch=(i686 x86_64)
url='http://www.zabbix.com/'
license=(GPL)
-makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmariadb libldap)
+makedepends=(postgresql-libs libxml2 unixodbc net-snmp libmariadbclient libldap)
source=(https://downloads.sourceforge.net/sourceforge/zabbix/zabbix-${pkgver}.tar.gz
zabbix-agent.{service,sysusers,tmpfiles}
zabbix-server{-sqlite,-mysql,-pgsql}.service zabbix-server.{sysusers,tmpfiles}
@@ -77,7 +77,7 @@
pkgdesc='Monitoring software for networks and applications'
depends=(net-snmp curl libxml2 sqlite unixodbc libldap)
optdepends=('postgresql-libs: for PostgreSQL support'
- 'libmariadb: for MariaDB support')
+ 'libmariadbclient: for MariaDB support')
backup=(etc/zabbix/zabbix_server.conf)
install=zabbix-server.install
@@ -144,7 +144,7 @@
package_zabbix-proxy() {
pkgdesc='Data collecting proxy for Zabbix'
depends=(net-snmp curl libxml2 sqlite unixodbc libldap)
- optdepends=('libmariadb: for MariaDB support'
+ optdepends=('libmariadbclient: for MariaDB support'
'postgresql-libs: for PostgreSQL support')
backup=(etc/zabbix/zabbix_proxy.conf)
@@ -155,7 +155,7 @@
install -d "$pkgdir/usr/share/$pkgname/$db"
install -m644 database/$db/schema.sql -t "$pkgdir/usr/share/$pkgname/$db"
- done
+ done
install -Dm644 conf/zabbix_proxy.conf "$pkgdir/etc/zabbix/zabbix_proxy.conf"
chown 171:171 "$pkgdir/etc/zabbix/zabbix_proxy.conf"
More information about the arch-commits
mailing list