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.

2 files changed, 59 insertions, 0 deletions

diff --git a/utils/c-code-indent b/utils/c-code-indent
new file mode 100755
index 0000000..0d5381d
--- /dev/null
+++ b/utils/c-code-indent
@@ -0,0 +1,3 @@
+#!/bin/sh
+PARAM="-npro -kr -nut -bbb -bad -i8 -ts8 -sob -l100 -ss -ncs -cp1 -sc -nsaf -nsai -nsaw -nbbo -hnl -br -ce"
+indent $PARAM "$@"
diff --git a/utils/set_version b/utils/set_version
new file mode 100755
index 0000000..c42f6d6
--- /dev/null
+++ b/utils/set_version
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+if [ $# != 1 ]; then
+    echo "Usage: $0 <new version number>"
+    exit 1
+fi
+
+if [ ! -d ./src -a ! -f redhat.spec ]; then
+    echo "Cannot find the ./src directory or the ./redhat.spec file"
+    echo "Are you in the project root directory?"
+    exit 2
+fi
+
+NEW_VERSION=$1
+OLD_VERSION=$(cd src;python -c "from setup_common import *; print get_version();")
+
+cat <<EOF
+
+  **
+  **  Changing version number
+  **
+
+  Are you sure you want to change the version number?
+
+     From: ${OLD_VERSION}
+     To:   ${NEW_VERSION}
+
+EOF
+echo -n "  Please confirm: (yes/no) "
+read conf
+
+case $conf in
+    yes|YES)
+        echo
+        echo " ** Updating src/version.h"
+        printf ",s/^#define VERSION \".*\"/#define VERSION \"${NEW_VERSION}\"/\nw\n" | ed src/version.h 2>/dev/null
+
+        echo " ** Updating redhat.spec"
+        printf ",s/^Version: .*/Version: ${NEW_VERSION}/\nw\n" | ed contrib/python-dmidecode.spec 2>/dev/null
+
+        echo
+        echo " ** git add src/version.h redhat.spec"
+        git add src/version.h contrib/python-dmidecode.spec
+        git diff --cached
+        echo
+        echo " REMEMBER to commit this change when you have validated the result"
+        echo
+        ;;
+    *)
+        echo
+        echo
+        echo " ** Not confirmed.  Aborting."
+        echo
+        ;;
+esac
+