From 8b1b5912fb1ffc689a686eb084968e6954d8b693 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 9 Jul 2012 20:29:25 +0200
Subject: [PATCH] linux-firmware: switch to /usr.

---
 .../linux-firmware-network.template              | 16 ++++++++--------
 srcpkgs/linux-firmware/template                  | 10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/linux-firmware/linux-firmware-network.template b/srcpkgs/linux-firmware/linux-firmware-network.template
index 8caa6680d73..657dc27a1fc 100644
--- a/srcpkgs/linux-firmware/linux-firmware-network.template
+++ b/srcpkgs/linux-firmware/linux-firmware-network.template
@@ -10,17 +10,17 @@ noarch=yes
 
 do_install() {
 	# 3Com
-	vmove lib/firmware/3com lib/firmware
+	vmove usr/lib/firmware/3com usr/lib/firmware
 	# Realtek
-	vmove lib/firmware/RTL8192E lib/firmware
-	vmove "lib/firmware/rt*" lib/firmware
+	vmove usr/lib/firmware/RTL8192E usr/lib/firmware
+	vmove "usr/lib/firmware/rt*" usr/lib/firmware
 	# Atheros
-	vmove "lib/firmware/ath*" lib/firmware
-	vmove "lib/firmware/ar*" lib/firmware
+	vmove "usr/lib/firmware/ath*" usr/lib/firmware
+	vmove "usr/lib/firmware/ar*" usr/lib/firmware
 	# bnx2
-	vmove "lib/firmware/bnx2*" lib/firmware
+	vmove "usr/lib/firmware/bnx2*" usr/lib/firmware
 	# Broadcom
-	vmove lib/firmware/brcm lib/firmware
+	vmove usr/lib/firmware/brcm usr/lib/firmware
 	# Intel
-	vmove "lib/firmware/i*" lib/firmware
+	vmove "usr/lib/firmware/i*" usr/lib/firmware
 }
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 37c59314212..04511f2b42b 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version="$(date -u +%Y%m%d)"
-revision=2
+revision=1
 noarch=yes
 nofetch=yes
 noextract=yes
@@ -29,11 +29,11 @@ do_fetch() {
 }
 
 do_install() {
-	vmkdir lib/firmware
+	vmkdir usr/lib/firmware
 	vmkdir usr/share/licenses/${pkgname}
-	vcopy "*" lib/firmware
-	rm -f ${DESTDIR}/lib/firmware/GPL{,-3}
-	mv ${DESTDIR}/lib/firmware/{LICEN*,WHENCE} \
+	vcopy "*" usr/lib/firmware
+	rm -f ${DESTDIR}/usr/lib/firmware/GPL{,-3}
+	mv ${DESTDIR}/usr/lib/firmware/{LICEN*,WHENCE} \
 		${DESTDIR}/usr/share/licenses/${pkgname}
 	# XXX disabled for now, reenable when it works.
 	#wget http://anonscm.debian.org/viewvc/kernel/dists/squeeze/firmware-nonfree/atheros/ar9170.fw?view=co \