Merge AdrianSimionov's changes

ChangeLog

@@ -1,3 +1,19 @@
+version 0.9.8 (??/??/????):
+	* Massive improvements by Adrian Simionov
+
+version 0.9.7 (10/18/2012):
+	* Properly check for net-snmp headers (#3388921)
+	* exit(2) on parse failures (Bradley Baetz - #3015411)
+	* Support typed GenericTLVs (Bradley Baetz - #1115132)
+	* Fix compilation issues on MacOS X (#3382125, #3497516)
+	* Support IPv6 (Benedikt Schirrmeister)
+	* Switch to dpkg's md5.c to eliminate the advertising clause
+	  (#3495093)
+	* Write errors to stderr
+	* Allow - as a filename to mean stdin/stdout
+	* Accept -o with -d to disable OID decoding
+	  (Benedikt Schirrmeister - #3310695)
+
 version 0.9.6 (06/14/2010):
 	* Fix compiling on systems where -lm is required (Oliver Hitz)
 	* Support newer versions of GNU m4

Makefile.am

@@ -17,7 +17,7 @@ version-check:
 	head ChangeLog | grep "^version $(VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
 
 # Ensure we're working from a tag...
-	HEAD=`git rev-parse --verify HEAD` && test `git tag -l v$(VERSION) --contains $$HEAD | wc -l` -gt 0
+	HEAD=`git rev-parse --verify HEAD` && test `git tag -l upstream/$(VERSION) --contains $$HEAD | wc -l` -gt 0
 # ... and have no changes in the working copy.
 	git status | grep -q "working directory clean"
 

README.md

@@ -51,7 +51,7 @@ Installation steps
 
 Follow the following steps to download and install the utility.
 
-    git clone https://github.com/AdrianSimionov/docsis.git
+    git clone https://github.com/rlaager/docsis.git
     cd docsis
     ./autogen.sh
     ./configure

configure.in

@@ -1,4 +1,4 @@
-AC_INIT([docsis],[0.9.6-dev-3.0-upgrade])
+AC_INIT([docsis], [0.9.8-dev])
 AC_CONFIG_SRCDIR([src/docsis.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([dist-bzip2])