Author: mvidner Date: Tue Oct 9 13:43:42 2007 New Revision: 41287 URL: http://svn.opensuse.org/viewcvs/yast?rev=41287&view=rev Log: Merged revisions 39435 via svnmerge from http://svn.opensuse.org/svn/yast/trunk/hardware-detection (but without the conditional compilation because SLE10 hwinfo does not have pkgconfig yet) ........ r39435 | mvidner | 2007-07-16 14:38:16 +0200 (Po, 16 čec 2007) | 2 lines Added .probe.fingerprint (F301952). ........ Modified: branches/SuSE-SLE-10-SP1-Branch/hardware-detection/ (props changed) branches/SuSE-SLE-10-SP1-Branch/hardware-detection/VERSION branches/SuSE-SLE-10-SP1-Branch/hardware-detection/package/yast2-hardware-detection.changes branches/SuSE-SLE-10-SP1-Branch/hardware-detection/src/HwProbe.cc branches/SuSE-SLE-10-SP1-Branch/hardware-detection/yast2-hardware-detection.spec.in Modified: branches/SuSE-SLE-10-SP1-Branch/hardware-detection/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/hardware-detection/VERSION?rev=41287&r1=41286&r2=41287&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/hardware-detection/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/hardware-detection/VERSION Tue Oct 9 13:43:42 2007 @@ -1 +1 @@ -2.13.7 +2.13.8 Modified: branches/SuSE-SLE-10-SP1-Branch/hardware-detection/package/yast2-hardware-detection.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/hardware-detection/package/yast2-hardware-detection.changes?rev=41287&r1=41286&r2=41287&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/hardware-detection/package/yast2-hardware-detection.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/hardware-detection/package/yast2-hardware-detection.changes Tue Oct 9 13:43:42 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 9 10:48:20 CEST 2007 - mvidner@suse.cz + +- Added .probe.fingerprint (F302658,F301952). +- 2.13.8 + +------------------------------------------------------------------- Thu Mar 1 16:57:43 CET 2007 - mvidner@suse.cz - Fixed a bug in the last change that converted nearly Modified: branches/SuSE-SLE-10-SP1-Branch/hardware-detection/src/HwProbe.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/hardware-detection/src/HwProbe.cc?rev=41287&r1=41286&r2=41287&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/hardware-detection/src/HwProbe.cc (original) +++ branches/SuSE-SLE-10-SP1-Branch/hardware-detection/src/HwProbe.cc Tue Oct 9 13:43:42 2007 @@ -307,6 +307,7 @@ { "tape", ITEM(hw_tape), pr_null, 0}, { "bluetooth", ITEM(hw_bluetooth), pr_null, 0}, { "dsl", ITEM(hw_dsl), pr_null, 0}, + { "fingerprint", ITEM(hw_fingerprint), pr_null, 0}, //not-yet-in-hwinfo { "vbe", ITEM(hw_vbe), pr_null, 0}, { 0, 0, pr_null, 0 } }; Modified: branches/SuSE-SLE-10-SP1-Branch/hardware-detection/yast2-hardware-detection.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/hardware-detection/yast2-hardware-detection.spec.in?rev=41287&r1=41286&r2=41287&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/hardware-detection/yast2-hardware-detection.spec.in (original) +++ branches/SuSE-SLE-10-SP1-Branch/hardware-detection/yast2-hardware-detection.spec.in Tue Oct 9 13:43:42 2007 @@ -3,8 +3,8 @@ @HEADER@ BuildRequires: blocxx-devel gcc-c++ hal-devel hwinfo-devel libxcrypt-devel openssl-devel yast2-core-devel yast2-devtools doxygen Summary: - -# hwinfo-12.44: hd_is_xen -Requires: hwinfo >= 12.44 +# hwinfo-12.47: hw_fingerprint +Requires: hwinfo >= 12.47 %description - -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org