diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
| commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
| tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /libre/hplip-libre/PKGBUILD | |
| parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
| parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'libre/hplip-libre/PKGBUILD')
| -rw-r--r-- | libre/hplip-libre/PKGBUILD | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index ff876dfe8..81b24e100 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.12.2 +pkgver=3.12.4 pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64') @@ -13,14 +13,14 @@ url="http://hplipopensource.com" license=('GPL') depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' 'net-snmp>=5.7.1') -makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') +makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') optdepends=('cups: for printing support' 'dbus-python: for dbus support' 'sane: for scanner support' 'python-imaging: for commandline scanning support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' - 'python2-qt: for running hp-toolbox' + 'python2-pyqt: for running hp-toolbox' 'python2-gobject2: for running hp-toolbox') replaces=('hpijs' "${_pkgname}") conflicts=("${_pkgname}") @@ -28,8 +28,6 @@ provides=("${_pkgname}=${pkgver}") options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) -sha1sums=('bdf3e37a344f5b57b62425f755c4293d6d4ae875' - 'aa00cdf755fea38f39247a0a4a2e8241dc15112c') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -68,4 +66,9 @@ package() { rm -rf "$pkgdir"/etc/{sane.d,xdg} # remove HAL .fdi file because HAL is no longer used rm -rf "$pkgdir"/usr/share/hal + # move to /usr + mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/ + rm "$pkgdir"/lib -r } +md5sums=('a063f76aa47edab55a3f31ff2558df07' + '2fe18f4091afb3dec200271dc7836128') |