diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-14 18:16:51 +0200 |
| commit | b32e36625b44b5c002c417ab4faf6311258c7671 (patch) | |
| tree | 87f91f6f7d9ccb229f9c7613f5411534bd504f5e /extra/dbus-python | |
| parent | 1a274201c465801ed2271018f426f0eaf7098215 (diff) | |
| parent | 35c30674b2b901077a809a6f1d8e5a0115098c8b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/mplayer2/PKGBUILD
community/pcmanfm/PKGBUILD
extra/liblrdf/PKGBUILD
extra/php-apc/PKGBUILD
extra/sqlite/PKGBUILD
kde-unstable/libkgapi/PKGBUILD
kde-unstable/soprano/PKGBUILD
multilib/lib32-libphobos-ldc/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-sqlite3/PKGBUILD
Diffstat (limited to 'extra/dbus-python')
| -rw-r--r-- | extra/dbus-python/PKGBUILD | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD index 44cd86f23..d37d66780 100644 --- a/extra/dbus-python/PKGBUILD +++ b/extra/dbus-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161366 2012-06-10 10:37:10Z jgc $ +# $Id: PKGBUILD 161472 2012-06-11 18:34:18Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=dbus-python pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common') pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for DBUS" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') @@ -29,6 +29,7 @@ build() { package_python-dbus-common() { pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus" + conflicts=('dbus-python<1.1.0') cd "${srcdir}/build-python3" make DESTDIR="${pkgdir}" install-data |