aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.dk>2017-11-26 14:01:57 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2017-11-28 17:24:04 +0000
commitff3fb011376a73e8bea50d3b6479b0828933ea88 (patch)
treebf256f5fb6fa75ea8eac1f116b74cec378333a10
parent218771f06c3f7c0d692d8909ed7115dfaf42a72c (diff)
downloadaports-ff3fb011376a73e8bea50d3b6479b0828933ea88.tar.gz
aports-ff3fb011376a73e8bea50d3b6479b0828933ea88.tar.bz2
aports-ff3fb011376a73e8bea50d3b6479b0828933ea88.tar.xz
main/usbutils: upgrade to 009
-rw-r--r--main/usbutils/APKBUILD13
-rw-r--r--main/usbutils/hwdata.patch20
-rw-r--r--main/usbutils/usbutils-006-hwdata.patch13
3 files changed, 25 insertions, 21 deletions
diff --git a/main/usbutils/APKBUILD b/main/usbutils/APKBUILD
index 642878435f..beb0b74e6e 100644
--- a/main/usbutils/APKBUILD
+++ b/main/usbutils/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=usbutils
-pkgver=008
-pkgrel=2
+pkgver=009
+pkgrel=0
pkgdesc="USB Device Utilities"
url="http://linux-usb.sourceforge.net/"
arch="all"
@@ -10,7 +10,7 @@ subpackages="$pkgname-doc"
depends="hwdata-usb"
makedepends="libusb-dev eudev-dev"
source="http://www.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar.xz
- usbutils-006-hwdata.patch
+ hwdata.patch
"
builddir="$srcdir"/$pkgname-$pkgver
@@ -35,10 +35,7 @@ check() {
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
- mkdir -p "$pkgdir"/usr/lib/
- mv "$pkgdir"/usr/share/pkgconfig \
- "$pkgdir"/usr/lib/
}
-sha512sums="ab1ad36467ff79ff5ab0b924620001612cae44def58c05ade01a4e58d8a4d48df61c09faba49a20497b7d6314045bbaf137b51a9f4e6b65ed0ea3bb339bf1c45 usbutils-008.tar.xz
-681894f85f4abe1593ca00cfa5be7d57e44d4aa90e69f94f6fc621d265c6d6c492622710f3bed3c75ee5459a634848516ad0ef1e3830075c5a55b8172c53af1e usbutils-006-hwdata.patch"
+sha512sums="e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a usbutils-009.tar.xz
+951609353bdd2a2a6ac52028a1071698756f806f8bfd785fcae9d949e27e3f932a6fdd484859cba1258f617b553f3c72f7bbeaece3c2e7cdbc4e1c630ec8ce92 hwdata.patch"
diff --git a/main/usbutils/hwdata.patch b/main/usbutils/hwdata.patch
new file mode 100644
index 0000000000..93816c4ba5
--- /dev/null
+++ b/main/usbutils/hwdata.patch
@@ -0,0 +1,20 @@
+--- a/lsusb.py.in
++++ b/lsusb.py.in
+@@ -96,7 +96,7 @@
+ return True
+
+ def parse_usb_ids():
+- "Parse /usr/share/usb.ids and fill usbvendors, usbproducts, usbclasses"
++ "Parse /usr/share/hwdata/usb.ids and fill usbvendors, usbproducts, usbclasses"
+ id = 0
+ sid = 0
+ mode = 0
+@@ -520,7 +520,7 @@
+ print " -c use colors"
+ print " -e display endpoint info"
+ print " -w display warning if usb.ids is not sorted correctly"
+- print " -f FILE override filename for /usr/share/usb.ids"
++ print " -f FILE override filename for /usr/share/hwdata/usb.ids"
+ print "Use lsusb.py -ciu to get a nice overview of your USB devices."
+ return 2
+
diff --git a/main/usbutils/usbutils-006-hwdata.patch b/main/usbutils/usbutils-006-hwdata.patch
deleted file mode 100644
index a8e3961786..0000000000
--- a/main/usbutils/usbutils-006-hwdata.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lsusb.py b/lsusb.py
-index 7816a5a..f18aa7f 100755
---- a/lsusb.py
-+++ b/lsusb.py
-@@ -18,7 +18,7 @@ warnsort = False
- showeps = False
-
- prefix = "/sys/bus/usb/devices/"
--usbids = "/usr/share/usb.ids"
-+usbids = "/usr/share/hwdata/usb.ids"
-
- esc = chr(27)
- norm = esc + "[0;0m"