From: Karsten Hopp Date: Fri, 11 Jan 2008 21:31:39 +0000 (+0100) Subject: Merge commit '3e81c4bd3a889849da7a0bdeaa266e22dbff8977' into rhel5 X-Git-Tag: hwdata-0.212-1~6 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b3edaa6da9b8636054191ef86a1a3cc75192a5eb;p=oweals%2Fhwdata.git Merge commit '3e81c4bd3a889849da7a0bdeaa266e22dbff8977' into rhel5 * commit '3e81c4bd3a889849da7a0bdeaa266e22dbff8977': MonitorsDB: add Dell 2408WFP - add Proview 926w monitor - add Proview 926w monitor (#363091) - use bzip2 sources - new release add Dell 3008WFP monitor - changes for git - fix license tag Update pci.ids and usb.ids Add helper targets for updating PCI and USB ID lists. Document which versions of the license we mean MonitorsDB: add Dell E157FPT - sort Acer monitors inf2mondb: replace various forms of "DELL" with "Dell" for consistency inf2mondb: remove double-quote characters in ini string table inf2mondb: add --inflist to pass filename with list of ini files -drop dell-monitors patch, move all entries to MonitorsDB add Proview monitors (#363091) Conflicts: MonitorsDB hwdata.spec pci.ids usb.ids --- b3edaa6da9b8636054191ef86a1a3cc75192a5eb diff --cc hwdata.spec index df98240,be31c33..4ffaefb --- a/hwdata.spec +++ b/hwdata.spec @@@ -1,10 -1,10 +1,10 @@@ Name: hwdata Summary: Hardware identification and configuration data -Version: 0.209 +Version: 0.211 - Release: 1 - License: GPL/MIT + Release: 1%{?dist} + License: GPLv2+ and LGPLv2+ Group: System Environment/Base - Source: hwdata-%{version}.tar.gz + Source: hwdata-%{version}.tar.bz2 BuildArch: noarch Conflicts: Xconfigurator, system-config-display < 1.0.31, pcmcia-cs, kudzu < 1.2.0 Requires: module-init-tools >= 3.2 @@@ -28,51 -31,79 +31,68 @@@ rm -rf $RPM_BUILD_ROO %files %defattr(-,root,root) %doc LICENSE COPYING -%dir %{_datadir}/%{name} -%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist -%{_datadir}/%{name}/* +%dir /usr/share/hwdata +%config(noreplace) /etc/modprobe.d/blacklist +%config /usr/share/hwdata/* %changelog + * Sat Dec 22 2007 Karsten Hopp 0.209-1 + - add Proview 926w monitor (#363091) + + * Sat Dec 22 2007 Karsten Hopp 0.208-1 + - new release + - drop dell-monitors patch, already included in tarball + + * Thu Dec 13 2007 Karsten Hopp 0.207-3 + - fix License tag + - add empty %%build section for fedora-review + + * Thu Oct 25 2007 Matt Domsch 0.207-2 + - MonitorsDB: add 20 new Dell monitors + -* Wed Aug 29 2007 Karsten Hopp 0.207-1 -- update license tag - -* Mon Aug 06 2007 Adam Jackson 0.207-1 -- MonitorsDB: Fix the sync ranges for the generic monitors to not be quite - so dumb. 90kHz hsync is way out of range for any common single-link DVI - panel, for example. (#247271) - -* Thu Jul 12 2007 Karsten Hopp 0.206-1 -- build - --* Wed Jul 11 2007 Matt Domsch -- add dell-monitors.patch so Dell can update these themselves. - -* Mon Jul 02 2007 Karsten Hopp 0.206-1 -- add Acer AL1916W monitor (#200572) -- add Eizo L568D, L568 (#200572) -- add Samsung 795DF/795MB/Magic CD175GP (#200572) +* Wed Sep 26 2007 Karsten Hopp 0.211-1 +- pull new upstream pci.ids, usb.ids -* Mon Jun 25 2007 Karsten Hopp 0.204-1 -- add some Samsung monitors to MonitorsDB, bz#245434, bz#245439 +* Thu Sep 20 2007 Karsten Hopp 0.210-1 +- add pci.id for Chelsio 10GbE Ethernet Adapter +- Resolves: bz #296811 -* Mon Jun 25 2007 Karsten Hopp 0.203-1 -- add Samsung Syncmaster 591v, bz#240660 -- add LG L1740B, Mtek MT-0910, bz#240662 -- move blacklist matrxfb_base from module-init-tools blacklist-compat - into hwdata's blacklist, bz#241595 -- update pci.ids, usb.ids +* Wed Sep 19 2007 Karsten Hopp 0.209-1 +- pull new upstream pci.ids, usb.ids -* Tue Apr 10 2007 Karsten Hopp 0.200-1 -- use macros -- update pci.ids ++* Wed Aug 29 2007 Karsten Hopp 0.207-1 ++- update license tag + -* Mon Mar 12 2007 Karsten Hopp 0.199-1 -- drop %%config from data files in /usr +* Wed Aug 15 2007 Karsten Hopp 0.207-1 +- pull new upstream pci.ids and rebuild +- Resolves: bz #251732 +- Resolves: bz #251734 +- Resolves: bz #252195 +- Resolves: bz #252196 +- Resolves: bz #241274 -* Tue Feb 27 2007 Adam Jackson 0.198-1 -- Fix the intel entry in videodrivers to be tab-delimited (#227591) -- Add a check for same to the 'check' target -- Add clog target to Makefile +* Tue Aug 14 2007 Karsten Hopp 0.205-1 +- add HP TFT5600 #229370 -* Mon Feb 26 2007 Karsten Hopp 0.197-1 -- add disttag +* Mon Jul 09 2007 Karsten Hopp 0.205-1 +- enable iwl4965 blacklist +- Resolves: bz#245379 -* Wed Feb 21 2007 Karsten Hopp 0.196-1 -- review fixes +* Mon Jun 25 2007 Karsten Hopp 0.205-1 +- really update pci.ids, update-pciids downloaded an old file +- disable iwl4965 blacklist as it is not approved yet (#245379) -* Mon Jan 29 2007 Karsten Hopp -- add some monitors (#224510) +* Mon Jun 25 2007 Karsten Hopp 0.202-1 +- don't load iwl4965 module automatically +- Resolves: #245379 -* Tue Jan 23 2007 Karsten Hopp 0.195-1 -- update pci.ids, usb.ids and build for FC-7 +* Tue Jun 19 2007 Karsten Hopp 0.201-1 +- add some monitors +- Resolves: #224511 +- update pci.ids +- Related: #223105 -* Tue Jan 02 2007 Karsten Hopp 0.193-1 +* Tue Jan 02 2007 Karsten Hopp 0.194-1 - Update to latest pci.ids/usb.ids for RHEL5 - Resolves: #220182 Add some Dell monitors to MonitorDB