diff -Nru fwts-0.20.19/debian/changelog fwts-0.21.00/debian/changelog --- fwts-0.20.19/debian/changelog 2011-01-12 10:07:03.000000000 +0000 +++ fwts-0.21.00/debian/changelog 2011-01-14 11:15:21.000000000 +0000 @@ -1,3 +1,17 @@ +fwts (0.21.00) natty; urgency=low + + * New version for release (LP: #702821) + + -- Colin King Fri, 14 Jan 2011 11:13:00 +0000 + +fwts (0.20.20) natty; urgency=low + + * acpi: wmi: handle "table not found" correctly. + * doc: manpage. fix --disassemble-aml text. + * lib: framework: report month correctly (offset by 1) + + -- Colin King Fri, 14 Jan 2011 09:28:00 +0000 + fwts (0.20.19) natty; urgency=low * New version for release (LP: #701843) @@ -12,7 +26,7 @@ * bios: mtrr: use list iterator * New upstream version 0.20.19 - -- Colin King Wed, 12 Jan 2010 09:58:07 +0000 + -- Colin King Wed, 12 Jan 2011 09:58:07 +0000 fwts (0.20.18) natty; urgency=low @@ -20,7 +34,7 @@ * Add more syntaxcheck advise * New upstream version 0.20.18 - -- Colin King Mon, 10 Jan 2010 16:11:52 +0000 + -- Colin King Mon, 10 Jan 2011 16:11:52 +0000 fwts (0.20.17) natty; urgency=low @@ -28,14 +42,14 @@ * Add syntaxcheck advise from a json lookup table * New upstream version 0.20.17 - -- Colin King Thu, 6 Jan 2010 19:17:02 +0000 + -- Colin King Thu, 6 Jan 2011 19:17:02 +0000 fwts (0.20.16) natty; urgency=low * Dump out AML source with error message on syntaxcheck test * New upstream version 0.20.16 - -- Colin King Thu, 6 Jan 2010 11:47:47 +0000 + -- Colin King Thu, 6 Jan 2011 11:47:47 +0000 fwts (0.20.15) natty; urgency=low @@ -43,14 +57,14 @@ * Tidy up iasl specific code * New upstream version 0.20.15 - -- Colin King Wed, 5 Jan 2010 19:07:59 +0000 + -- Colin King Wed, 5 Jan 2011 19:07:59 +0000 fwts (0.20.14) natty; urgency=low * Add debian/libfwtsiasl1.install * New upstream version 0.20.14 - -- Colin King Wed, 5 Jan 2010 14:14:05 +0000 + -- Colin King Wed, 5 Jan 2011 14:14:05 +0000 fwts (0.20.13) natty; urgency=low @@ -59,7 +73,7 @@ * Remove need to check for existance of iasl tool * New upstream version 0.20.13 - -- Colin King Wed, 5 Jan 2010 13:18:02 +0000 + -- Colin King Wed, 5 Jan 2011 13:18:02 +0000 fwts (0.20.12) natty; urgency=low diff -Nru fwts-0.20.19/debian/fwts.install fwts-0.21.00/debian/fwts.install --- fwts-0.20.19/debian/fwts.install 2011-01-12 10:07:03.000000000 +0000 +++ fwts-0.21.00/debian/fwts.install 2011-01-14 11:15:21.000000000 +0000 @@ -1,4 +1,4 @@ data/klog.json usr/share/fwts data/syntaxcheck.json usr/share/fwts -debian/tmp/usr/bin/fwts usr/bin -debian/tmp/usr/share/man/man1/fwts.1 usr/share/man/man1 +usr/bin/fwts usr/bin +usr/share/man/man1/fwts.1 usr/share/man/man1 diff -Nru fwts-0.20.19/debian/libfwtsiasl1.install fwts-0.21.00/debian/libfwtsiasl1.install --- fwts-0.20.19/debian/libfwtsiasl1.install 2011-01-12 10:07:03.000000000 +0000 +++ fwts-0.21.00/debian/libfwtsiasl1.install 2011-01-14 11:15:21.000000000 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/libfwtsiasl.so.* usr/lib +usr/lib/libfwtsiasl.so.* usr/lib diff -Nru fwts-0.20.19/doc/fwts.1 fwts-0.21.00/doc/fwts.1 --- fwts-0.20.19/doc/fwts.1 2011-01-12 10:07:03.000000000 +0000 +++ fwts-0.21.00/doc/fwts.1 2011-01-14 11:15:21.000000000 +0000 @@ -76,7 +76,7 @@ .TP .B \-\-disassemble\-aml Disassemble AML (ACPI machine language) byte code. This attempts to disassemble AML in DSDT and SSDT -tables and generates DSDT.dsl and SSDTx.dsl (where x the Nth SSDT table) sources. +tables and generates DSDT.dsl and SSDTx.dsl sources. .TP .B \-\-dmidecode=file specify the full path and filename to the the dmidecode binary. diff -Nru fwts-0.20.19/src/acpi/wmi/wmi.c fwts-0.21.00/src/acpi/wmi/wmi.c --- fwts-0.20.19/src/acpi/wmi/wmi.c 2011-01-12 10:07:03.000000000 +0000 +++ fwts-0.21.00/src/acpi/wmi/wmi.c 2011-01-14 11:15:21.000000000 +0000 @@ -233,13 +233,15 @@ fwts_list_link *item; fwts_list* iasl_output; int count = 0; + int ret; - if (fwts_iasl_disassemble(fw, table, which, &iasl_output) != FWTS_OK) { + ret = fwts_iasl_disassemble(fw, table, which, &iasl_output); + if (ret == FWTS_NO_TABLE) /* Nothing more to do */ + return ret; + if (ret != FWTS_OK) { fwts_aborted(fw, "Cannot disassemble and parse for WMI information."); return FWTS_ERROR; } - if (iasl_output == NULL) - return FWTS_NO_TABLE; fwts_list_foreach(item, iasl_output) wmi_parse_for_wdg(fw, item, &count); diff -Nru fwts-0.20.19/src/lib/include/fwts_version.h fwts-0.21.00/src/lib/include/fwts_version.h --- fwts-0.20.19/src/lib/include/fwts_version.h 2011-01-12 10:07:03.000000000 +0000 +++ fwts-0.21.00/src/lib/include/fwts_version.h 2011-01-14 11:15:21.000000000 +0000 @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ -#define FWTS_VERSION "V0.20.19" -#define FWTS_DATE "Wed Jan 12 10:06:09 GMT 2011" +#define FWTS_VERSION "V0.21.00" +#define FWTS_DATE "Fri Jan 14 11:14:23 GMT 2011" diff -Nru fwts-0.20.19/src/lib/src/framework.c fwts-0.21.00/src/lib/src/framework.c --- fwts-0.20.19/src/lib/src/framework.c 2011-01-12 10:07:03.000000000 +0000 +++ fwts-0.21.00/src/lib/src/framework.c 2011-01-14 11:15:21.000000000 +0000 @@ -851,7 +851,7 @@ fwts_log_nl(fw); fwts_log_info(fw, "This test run on %2.2d/%2.2d/%-2.2d at %2.2d:%2.2d:%2.2d on host %s %s %s %s %s.", - tm.tm_mday, tm.tm_mon, (tm.tm_year+1900) % 100, + tm.tm_mday, tm.tm_mon + 1, (tm.tm_year+1900) % 100, tm.tm_hour, tm.tm_min, tm.tm_sec, buf.sysname, buf.nodename, buf.release, buf.version, buf.machine); fwts_log_nl(fw);