Merge commit 'nima/xml'

Conflicts:
	debian/changelog
		Had the same changelog entry in both xml and master
		branch, with a minor wording difference.  Removed the
		duplicate and merged in the changelog entries from the
		XML branch

	src/dmidecode.c
		Merge process got confused by some functions which was not
		changed.  Removed the code coming from the master branch and
		let the XML be the base.

	src/setup-dbg.py
	src/setup.py
		In the XML branch, the version of the python-dmidecode is
		now a function which retrieves the version number from
		src/version.h.  Merged in this feature to master as well.

1 files changed, 28 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index e9a044f..01b37e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,34 @@
+python-dmidecode (3.10.6-2) unstable; urgency=low
+
+  * Fixed homepage (Closes: #540389).
+
+ -- Nima Talebi <nima@it.net.au>  Sat, 08 Aug 2009 13:53:40 +1000
+
+python-dmidecode (3.10.6-1) unstable; urgency=low
+
+  * Introducing the XML extensions to python-dmidecode, by of David Sommerseth
+    from Red Hat.  A big thankyou to David, Red Hat, and other people from
+    Red Hat that contributed (and are still contributing) time and knowledge
+    to this project.  These changes are summarized as follows...
+  * Rewritten the internals to use libxml2 for (in memory) data storage.
+  * Added much more useful information into the XML data than what the original
+    data structured could held.
+  * Implemented mapping methods to dynamically map XML fields to Python
+    dictionaries.  The mapping itself is defined in an XML file utilising XPath
+    expressions.
+  * Prepared python-dmidecode for a native XML implementation from Python using
+    libxml2.
+
+ -- Nima Talebi <nima@it.net.au>  Sat, 23 May 2009 13:19:25 +1000
+
 python-dmidecode (2.10.6-1) unstable; urgency=low
 
-  * David Sommerseth picked up some bad behaviour while working on the libxml2
-    extension of python-dmidecode - on further investigation it was found that
-    this was due to a copy-paste-gone-wrong during the initial migration of
-    dmidecode to python-dmidecode - Fixed.
+  * David Sommerseth, as part of wrting the XML (libxml2) extensions to
+    python-dmidecode, noted a few abnormalities.  Sure enough, they were
+    silent bugs introduced at the time of the initial writing of
+    python-dmidecode (from dmidecode).  This has now been fixed.
 
- -- Nima Talebi <nima@it.net.au>  Wed, 20 May 2009 22:32:24 +1000
+ -- Nima Talebi <nima@it.net.au>  Wed, 20 May 2009 23:15:32 +1000
 
 python-dmidecode (2.10.5-3) unstable; urgency=low