[arch-commits] Commit in usbutils/repos (5 files)

[Tom Gundersen]

    Date: Wednesday, May 23, 2012 @ 16:09:20
  Author: tomegun
Revision: 159403

db-move: moved usbutils from [testing] to [core] (i686)

Added:
  usbutils/repos/core-i686/PKGBUILD
    (from rev 159399, usbutils/repos/testing-i686/PKGBUILD)
  usbutils/repos/core-i686/fix-python2.patch
    (from rev 159399, usbutils/repos/testing-i686/fix-python2.patch)
Deleted:
  usbutils/repos/core-i686/PKGBUILD
  usbutils/repos/core-i686/fix-python2.patch
  usbutils/repos/testing-i686/

-------------------+
 PKGBUILD          |   71 ++++++++++++++++++++++++++--------------------------
 fix-python2.patch |   34 ++++++++++++------------
 2 files changed, 53 insertions(+), 52 deletions(-)

Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD	2012-05-23 20:09:18 UTC (rev 159402)
+++ core-i686/PKGBUILD	2012-05-23 20:09:20 UTC (rev 159403)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: Tom Gundersen <teg at jklm.no>
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
-# Contributor: Curtis Campbell <curtisjamescampbell at hotmail.com>
-pkgname=usbutils
-pkgver=005
-pkgrel=1
-pkgdesc="USB Device Utilities"
-arch=(i686 x86_64)
-license=('GPL')
-groups=('base')
-depends=('libusb')
-optdepends=('python2: for lsusb.py usage'
-            'coreutils: for lsusb.py usage'
-            'wget: for update-usbids.sh usage')
-url="http://linux-usb.sourceforge.net/"
-# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        fix-python2.patch)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # patch lsusb.py to use correct usb.ids file and python2 interpreter
-  patch -Np1 -i $srcdir/fix-python2.patch
-  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-md5sums=('6a21f7b6c02b76df5e8a7c208d746654'
-         '45766196895b4cc50b53cd56e1bbf3d1')

Copied: usbutils/repos/core-i686/PKGBUILD (from rev 159399, usbutils/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD	                        (rev 0)
+++ core-i686/PKGBUILD	2012-05-23 20:09:20 UTC (rev 159403)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: Tom Gundersen <teg at jklm.no>
+# Contributor: Judd Vinet <jvinet at zeroflux.org>
+# Contributor: Curtis Campbell <curtisjamescampbell at hotmail.com>
+pkgname=usbutils
+pkgver=005
+pkgrel=2
+pkgdesc="USB Device Utilities"
+arch=(i686 x86_64)
+license=('GPL')
+groups=('base')
+depends=('libusb' 'hwids')
+optdepends=('python2: for lsusb.py usage'
+            'coreutils: for lsusb.py usage')
+url="http://linux-usb.sourceforge.net/"
+# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        fix-python2.patch)
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  # patch lsusb.py to use correct usb.ids file and python2 interpreter
+  patch -Np1 -i $srcdir/fix-python2.patch
+  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  # this is now in the hwids package
+  rm -rf $pkgdir/usr/{share/hwdata,sbin}
+}
+md5sums=('6a21f7b6c02b76df5e8a7c208d746654'
+         '45766196895b4cc50b53cd56e1bbf3d1')

Deleted: core-i686/fix-python2.patch
===================================================================
--- core-i686/fix-python2.patch	2012-05-23 20:09:18 UTC (rev 159402)
+++ core-i686/fix-python2.patch	2012-05-23 20:09:20 UTC (rev 159403)
@@ -1,17 +0,0 @@
---- 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 at 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"

Copied: usbutils/repos/core-i686/fix-python2.patch (from rev 159399, usbutils/repos/testing-i686/fix-python2.patch)
===================================================================
--- core-i686/fix-python2.patch	                        (rev 0)
+++ core-i686/fix-python2.patch	2012-05-23 20:09:20 UTC (rev 159403)
@@ -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 at 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"