debian: Check for accurate Debian changelog version at build time too.

When we increment the Open vSwitch version number, we tend to forget to
update it in debian/changelog at the same time.  Right now this gets
fixed up automatically at "make dist" time, but it's even better if we can
always have it be correct in the repository.  This commit should help with
that, by making both "make" and "make dist" refuse to proceed if the
version number is out of sync.

diff --git a/Makefile.am b/Makefile.am
index 62d4d491b561a02e8b7d2d6b4ef6fe0eca9d7819..718332622e61943d18f67113a9cf2d6e9a79af7d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,7 +69,6 @@ SUFFIXES =
 noinst_HEADERS += $(EXTRA_DIST)
 
 EXTRA_DIST += \
-       build-aux/update-debian-changelog \
        soexpand.pl
 
 ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'

diff --git a/boot.sh b/boot.sh
index dce5625c51acda80d0864a7c093825bffd7afb80..05dd3599646e634b2599cd512b00408a884e444d 100755 (executable)
--- a/boot.sh
+++ b/boot.sh
@@ -1,6 +1,2 @@
 #! /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"

diff --git a/build-aux/update-debian-changelog b/build-aux/update-debian-changelog
deleted file mode 100755 (executable)
index 9353e70..0000000
--- a/build-aux/update-debian-changelog
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /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 <dev@openvswitch.org>  `date -u +"%a, %d %b %Y %H:%M:%S +0000"`
-
-EOF
-        cat "$CHANGELOG"
-    } > "$CHANGELOG".new
-    mv -f "$CHANGELOG".new "$CHANGELOG"
-fi

diff --git a/configure.ac b/configure.ac
index aff53a1f69e23722eab87054e190b1ed115956d0..5dd6590edea69a752a019547e2aee0bf4711db55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,7 @@ AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PROG_MKDIR_P
+AC_PROG_FGREP
 
 AC_ARG_VAR([PERL], [path to Perl interpreter])
 AC_PATH_PROG([PERL], perl, no)

diff --git a/debian/automake.mk b/debian/automake.mk
index ad347df75fbeabf1a5a9b1e10917181ecb8778ee..7c656c8a8d284a12bd33881ba3b42ca079e40d6b 100644 (file)
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -62,7 +62,13 @@ EXTRA_DIST += \
        debian/rules \
        debian/rules.modules
 
-dist-hook-debian-changelog:
-       $(srcdir)/build-aux/update-debian-changelog '$(distdir)/debian/changelog' '$(VERSION)'
-DIST_HOOKS += dist-hook-debian-changelog
-EXTRA_DIST += build-aux/update-debian-changelog
+check-debian-changelog-version:
+       @if $(FGREP) '($(VERSION))' $(srcdir)/debian/changelog >/dev/null; \
+       then                                                               \
+         :;                                                               \
+       else                                                               \
+         echo "Update debian/changelog to mention version $(VERSION)";    \
+         exit 1;                                                          \
+       fi
+ALL_LOCAL += check-debian-changelog-version
+DIST_HOOKS += check-debian-changelog-version

diff --git a/debian/changelog b/debian/changelog
index 945f65d608166c9d6646a89fb7e2e21d32e1ea5a..216e089e17b5337f56cc6c36d4e1ecb3c46ebaa2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openvswitch (1.0.0) unstable; urgency=low
+openvswitch (1.0.1) unstable; urgency=low
 
   * New upstream version.