diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-30 10:11:16 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-30 10:11:16 +0200 |
| commit | c7e80d90ff5637e1be58084748ff74d0aefda9dd (patch) | |
| tree | 595803e7e17e207ccd5b5d5142124e668cba3a1f /libre/hplip-libre | |
| parent | 38e2ca05a73307a06dc9a8d6e9e97da7fcdff4fa (diff) | |
| parent | 3025740c981e5acc29f25b400bc93046776d7008 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/python2-matplotlib/PKGBUILD
community-testing/python2-matplotlib/setup.cfg
kde-unstable/kdebindings-python/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/libusbx/PKGBUILD
testing/pyqt/PKGBUILD
Diffstat (limited to 'libre/hplip-libre')
| -rw-r--r-- | libre/hplip-libre/PKGBUILD | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index e8f0b5303..4e5d829a2 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -2,12 +2,12 @@ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> -# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy> +# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> _pkgname=hplip pkgname=hplip-libre pkgver=3.12.6 -pkgrel=2 +pkgrel=3 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" arch=('i686' 'x86_64' 'mips64el') url="http://hplipopensource.com" @@ -16,7 +16,7 @@ depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' 'net-snmp>=5.7.1') makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx') optdepends=('cups: for printing support' - 'dbus-python: for dbus support' + 'python2-dbus: for dbus support' 'sane: for scanner support' 'python-imaging: for commandline scanning support' 'python-notify: for Desktop notification support' @@ -36,16 +36,16 @@ md5sums=('5303938e8630775ea6fb383af85775e5' build() { cd "$srcdir/$_pkgname-$pkgver" export PYTHON=python2 - + find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' setup.py makeuri.py base/magic.py sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py sed -i 's|python ./print.py|python2 ./print.py|' scan.py sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py - sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py + sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py - + # https://bugs.archlinux.org/task/30085 - hack found in Gentoo # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip @@ -57,7 +57,7 @@ build() { gzip > ${i}.temp || return 1 mv ${i}.temp ${i} done - + export AUTOMAKE='automake --foreign' autoreconf --force --install |