diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
| commit | 3a0008bd8a3e6f4f21181c1fadc17c3da3108907 (patch) | |
| tree | 175c9e1755980b2a955b1b9e6b93c1a3d431276f /core/usbutils | |
| parent | 933e5d274b2a4e386565d2f3bb982682e168438b (diff) | |
| parent | 2bba02fdaa36de05dffef6a54b57c73259d7db53 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/alienarena/PKGBUILD
community/mumble/PKGBUILD
community/mysql-workbench/PKGBUILD
community/paintown/PKGBUILD
community/ufoai/PKGBUILD
core/dcron/PKGBUILD
core/udev/PKGBUILD
extra/qt/PKGBUILD
extra/texlive-bin/PKGBUILD
testing/opencv/PKGBUILD
testing/pciutils/PKGBUILD
testing/usbutils/PKGBUILD
Diffstat (limited to 'core/usbutils')
| -rw-r--r-- | core/usbutils/PKGBUILD | 14 | ||||
| -rw-r--r-- | core/usbutils/fix-python2.patch | 17 |
2 files changed, 27 insertions, 4 deletions
diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD index 466292f14..31c83a9e9 100644 --- a/core/usbutils/PKGBUILD +++ b/core/usbutils/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 116702 2011-03-25 08:26:34Z tpowa $ +# $Id: PKGBUILD 118970 2011-04-09 20:52:11Z tpowa $ # Maintainer: Judd Vinet <jvinet@zeroflux.org> # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> pkgname=usbutils pkgver=002 -pkgrel=1 +pkgrel=2 pkgdesc="USB Device Utilities" arch=(i686 x86_64 'mips64el') license=('GPL') groups=('base') makedepends=('wget') depends=('glibc' 'libusb') +optdepends=('python2: for lsusb.py usage' + 'coreutils: for lsusb.py usage') url="http://linux-usb.sourceforge.net/" -source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('05610d15c3c8c8ada3d691c320ca784a') +source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz + fix-python2.patch) +md5sums=('05610d15c3c8c8ada3d691c320ca784a' + '45766196895b4cc50b53cd56e1bbf3d1') build() { cd $srcdir/$pkgname-$pkgver rm usb.ids wget http://www.linux-usb.org/usb.ids + # patch lsusb.py to use correct usb.ids file and python2 interpreter + patch -Np1 -i ../fix-python2.patch ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib make } diff --git a/core/usbutils/fix-python2.patch b/core/usbutils/fix-python2.patch new file mode 100644 index 000000000..7e2875e99 --- /dev/null +++ b/core/usbutils/fix-python2.patch @@ -0,0 +1,17 @@ +--- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 ++++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # lsusb.py + # Displays your USB devices in reasonable form. + # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. +@@ -16,7 +16,7 @@ + warnsort = False + + prefix = "/sys/bus/usb/devices/" +-usbids = "/usr/share/usb.ids" ++usbids = "/usr/share/hwdata/usb.ids" + + esc = chr(27) + norm = esc + "[0;0m" |