Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-cfg into hollywood

2 files changed, 38 insertions, 26 deletions

diff --git a/debian/autogen.sh b/debian/autogen.sh
index ff125d1..e8c94af 100755
--- a/debian/autogen.sh
+++ b/debian/autogen.sh
@@ -1,32 +1,6 @@
 #!/bin/sh
 
 
-if [ -d .git ] ; then
-# generate GNU/Debian format ChangeLog from git log
-
-    rm -f ChangeLog
-
-    if which git2cl >/dev/null ; then
-	git-log --pretty --numstat --summary | git2cl >> ChangeLog
-    else
-	git-log --pretty=short >> ChangeLog
-    fi
-
-# append repository reference
-
-    url=` git repo-config --get remote.origin.url`
-    test "x$url" = "x" && url=`pwd`
-
-    branch=`git-branch --no-color | sed '/^\* /!d; s/^\* //'`
-    test "x$branch" = "x" && branch=master
-
-    sha=`git log --pretty=oneline --no-color -n 1 | cut -c-8`
-    test "x$sha" = "x" && sha=00000000
-
-    echo "$url#$branch-$sha" >> ChangeLog
-
-fi
-
 rm -rf config
 rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL
 
diff --git a/debian/changelog b/debian/changelog
index e1076c5..734169c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+vyatta-cfg (0.9) unstable; urgency=low
+
+  3.0.5
+
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Tue, 06 May 2008 12:43:19 -0700
+
+vyatta-cfg (0.8) unstable; urgency=low
+
+  3.0.4
+  [ Mark O'Brien ]
+
+
+  [ An-Cheng Huang ]
+  * support "wildcard" ranking at boot time. only VRRP uses this for
+    now.
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Mon, 05 May 2008 16:40:38 -0700
+
+vyatta-cfg (0.7) unstable; urgency=low
+
+  3.0.3
+  [ Mark O'Brien ]
+
+
+  [ Stephen Hemminger ]
+  * Remove hack to cycle state for static routes
+  * Eliminate vestigates of watchlink
+
+  [ rbalocca ]
+  * Indicate the VC4.0.2 release candidate in the changelog
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Tue, 29 Apr 2008 16:42:21 -0700
+
 vyatta-cfg (0.6) unstable; urgency=low
 
   VC4.0.2