[hwdata/f14/master] * Thu Aug 05 2010 Karsten Hopp <karsten at redhat.com> 0.232-1 - update usb.ids, out.txt and pci.ids (#

[Karsten Hopp]

commit 21d5786ad6701422e71b3952ea3c8103c5ee72e2
Author: Karsten Hopp <karsten at redhat.com>
Date:   Thu Aug 5 13:41:43 2010 +0200

    * Thu Aug 05 2010 Karsten Hopp <karsten at redhat.com> 0.232-1
    - update usb.ids, out.txt and pci.ids (#550020, #611860)
    - fix incorrect syntax doc/comment in blacklist.conf (Ville Skyttä, #532802)
    - add Acer B243HL and BenQ G2420HDBL (Ville Skyttä, #590787)
    - add HP LP2475w and Samsung 2494HM (Ville Skyttä, #595059)

 .gitignore  |    1 +
 hwdata.spec |   25 +++++++++++++++++++++++--
 sources     |    2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d77c25..b1e0479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 hwdata-0.227.tar.bz2
+hwdata-0.232.tar.bz2
diff --git a/hwdata.spec b/hwdata.spec
index 6a4b8ca..7062e3a 100644
--- a/hwdata.spec
+++ b/hwdata.spec
@@ -1,8 +1,8 @@
 Name: hwdata
 Summary: Hardware identification and configuration data
-Version: 0.227
+Version: 0.232
 Release: 1%{?dist}
-License: GPLv2+ and LGPLv2+
+License: GPLv2+
 Group: System Environment/Base
 Source: hwdata-%{version}.tar.bz2
 URL:    http://git.fedorahosted.org/git/hwdata.git
@@ -37,9 +37,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/*
 
 %changelog
+* Thu Aug 05 2010 Karsten Hopp <karsten at redhat.com> 0.232-1
+- update usb.ids, out.txt and pci.ids (#550020, #611860)
+- fix incorrect syntax doc/comment in blacklist.conf (Ville Skyttä, #532802)
+- add Acer B243HL and BenQ G2420HDBL (Ville Skyttä, #590787)
+- add HP LP2475w and Samsung 2494HM (Ville Skyttä, #595059)
+
+* Tue May 25 2010 Phil Knirsch <pknirsch at redhat.com> 0.230-1
+- update usb.ids, out.txt and pci.ids
+- Resolves: #584788
+
+* Mon Mar 29 2010 Karsten Hopp <karsten at redhat.com> 0.229-1
+- update usb.ids, out.txt and pci.ids for F-13 (#571914)
+
+* Wed Mar 17 2010 Phil Knirsch <pknirsch at redhat.com> 0.228-1
+- Blacklist chsc_sch for s390x
+- Resolves: #563228
+
 * Tue Feb 23 2010 Dave Airlie <airlied at redhat.com> 0.227-1
 - add viafb to blacklist
 
+* Mon Feb 22 2010 Karsten Hopp <karsten at redhat.com> 0.227-1
+- update usb.ids, pci.ids, oui.txt
+- update license
+
 * Fri Jan 15 2010 Karsten Hopp <karsten at redhat.com> 0.226-1
 - update release number
 
diff --git a/sources b/sources
index d5767b9..9680f31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecf5b6f1b21c5359ff2984ba216f85e8  hwdata-0.227.tar.bz2
+f092c5ef9905e89fd38a52c4d9bae27b  hwdata-0.232.tar.bz2