Skip to content

Commit

Permalink
debian: Attempt to keep debian/changelog up-to-date.
Browse files Browse the repository at this point in the history
Invariably we forget to update the version number in debian/changelog as
we change OVS's own version number.  This is embarrassing.

This commit introduces two different times to automatically update the
debian/changelog version number: whenever boot.sh runs and whenever
"make dist" runs.  In the latter case, only the version number in the
distributed tarball is updated, but that seems OK.

Reported by Joan Cirer <[email protected]> most recently, and by others over
the last year or so too.
  • Loading branch information
blp committed May 27, 2010
1 parent 609d182 commit 208d496
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ noinst_SCRIPTS =
OVSIDL_BUILT =
SUFFIXES =

EXTRA_DIST += soexpand.pl
EXTRA_DIST += \
build-aux/update-debian-changelog \
soexpand.pl

ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'

Expand Down
4 changes: 4 additions & 0 deletions boot.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
#! /bin/sh
autoreconf --install --force

# Ensure that debian/changelog is up-to-date.
VERSION=`autom4te --language=autoconf -t 'AC_INIT:$2' configure.ac`
build-aux/update-debian-changelog debian/changelog "$VERSION"
37 changes: 37 additions & 0 deletions build-aux/update-debian-changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
#! /bin/sh

if test $# != 2; then
cat <<EOF
$0, to update version information a Debian changelog
usage: $0 CHANGELOG VERSION
This utility checks whether CHANGELOG, which should be a Debian changelog
file, contains a record for VERSION. If not, then it adds one at the top.
EOF
exit 1
fi

CHANGELOG=$1
VERSION=$2
if test ! -e "$CHANGELOG"; then
echo "$0: $CHANGELOG does not exist (use --help for help"
exit 1
fi

if grep '($(VERSION))' debian/changelog >/dev/null 2>&1; then
:
else
echo "Adding change log record for $VERSION to $CHANGELOG"
{
cat <<EOF
openvswitch ($VERSION) unstable; urgency=low
* New upstream version.
-- Open vSwitch team <[email protected]> `date -u +"%a, %d %b %Y %H:%M:%S +0000"`
EOF
cat "$CHANGELOG"
} > "$CHANGELOG".new
mv "$CHANGELOG".new "$CHANGELOG"
fi
4 changes: 4 additions & 0 deletions debian/automake.mk
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,7 @@ EXTRA_DIST += \
debian/reconfigure \
debian/rules \
debian/rules.modules

dist-hook:
$(srcdir)/build-aux/update-debian-changelog '$(distdir)/debian/changelog' '$(VERSION)'
EXTRA_DIST += build-aux/check-structs

0 comments on commit 208d496

Please sign in to comment.