diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-14 15:49:29 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-14 15:49:29 -0700 |
| commit | c3adc47d3c69fad9389eab0d53c7a6f792ffc58e (patch) | |
| tree | abfed2981abdc9a686903d39860ac04aeeae7af6 | |
| parent | 4f48211ecb5eca3fe592e3f2188497d064868da5 (diff) | |
| parent | a78a6d262a7ff1e49f61bbc4dc570965e56eb9ec (diff) | |
| download | vyatta-op-qos-c3adc47d3c69fad9389eab0d53c7a6f792ffc58e.tar.gz vyatta-op-qos-c3adc47d3c69fad9389eab0d53c7a6f792ffc58e.zip | |
Merge branch 'hollywood' of suva.vyatta.com:/git/vyatta-op-qos into hollywood
| -rw-r--r-- | .gitignore | 1 | ||||
| l--------- | ChangeLog | 1 | ||||
| -rwxr-xr-x | debian/autogen.sh | 26 | ||||
| -rw-r--r-- | debian/changelog | 27 |
4 files changed, 28 insertions, 27 deletions
@@ -1,4 +1,3 @@ -ChangeLog INSTALL Makefile Makefile.in diff --git a/ChangeLog b/ChangeLog new file mode 120000 index 0000000..d526672 --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ +debian/changelog
\ No newline at end of file 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 6c021cc..cc794af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,30 @@ +vyatta-op-qos (0.9) unstable; urgency=low + + 3.0.5 + + + -- Mark O'Brien <mobrien@vyatta.com> Tue, 06 May 2008 12:43:32 -0700 + +vyatta-op-qos (0.8) unstable; urgency=low + + 3.0.4 + + + -- Mark O'Brien <mobrien@vyatta.com> Mon, 05 May 2008 16:40:50 -0700 + +vyatta-op-qos (0.7) unstable; urgency=low + + 3.0.3 + [ Mark O'Brien ] + + + [ 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:35 -0700 + vyatta-op-qos (0.6) unstable; urgency=low VC4.0.2 |