Fixes for debian/changelog handling

- Fix paths for the case where "debian" dir is not at the top level
- Break the release build if debian/changelog is outdated, instead of
generating an entry (which would be unreproducible)
- Make "Build for x" entry reproducible - force name and email, copy its
  date from previous entry
- Deduplicate actual dpkg-buildpackage call

Author: marmarek

Makefile.debian

@@ -231,7 +231,6 @@ endif
 		fi; \
 	fi
 
-
 ifneq (,$(INCREMENT_DEVEL_VERSIONS))
 	# Break the hardlink - keep modified debian/changelog only inside of chroot
 	cp $(CHROOT_DEBIAN_DIR)/changelog $(CHROOT_DEBIAN_DIR)/changelog.copy
@@ -245,21 +244,22 @@ ifneq (,$(INCREMENT_DEVEL_VERSIONS))
 	# if the files are already there, do nothing because they are hardlinks
 	cp -np $(CHROOT_DEBIAN_DIR)/changelog.dist $(ORIG_SRC)/$(DEBIAN_BUILD_DIRS)/ 2>/dev/null || true
 	cp -np $(CHROOT_DEBIAN_DIR)/changelog.$(DIST) $(ORIG_SRC)/$(DEBIAN_BUILD_DIRS)/ 2>/dev/null || true
-
-	sudo $(CHROOT_ENV) chroot $(CHROOT_DIR) su $(RUN_AS_USER) -c 'cd $(DIST_SRC_DEBIAN_DIR)/..; export LC_ALL=C; dpkg-buildpackage -sa -uc -us'
 else
-	# Only used to update changelog to new version since changelog is 
-	# also called below
-	cd $(CHROOT_DEBIAN_DIR)/..; $(DEBIAN_PLUGIN_DIR)/scripts/debian-changelog.sh
+	# break the release build if changelog does not match version file
+	cd $(CHROOT_DEBIAN_DIR)/..; $(DEBIAN_PLUGIN_DIR)/scripts/debian-changelog.sh --verify
 
 	# Break the hardlink
 	cp $(CHROOT_DEBIAN_DIR)/changelog $(CHROOT_DEBIAN_DIR)/changelog.copy
 	mv $(CHROOT_DEBIAN_DIR)/changelog.copy $(CHROOT_DEBIAN_DIR)/changelog
 
 	echo "Building package in $(DIST_SRC)"
-	sudo $(CHROOT_ENV) chroot $(CHROOT_DIR) su $(RUN_AS_USER) -c 'cd $(DIST_SRC_DEBIAN_DIR)/..; export LC_ALL=C; debchange -t -l+$(DIST_TAG)u "Build for $(DIST)"; debchange -t --force-distribution -r -D $(DIST) $(DIST); dpkg-buildpackage -sa -uc -us'
+	cd $(CHROOT_DIR)/$(DIST_SRC)/$(PACKAGE)/..; export LC_ALL=C DEBFULLNAME=Builder DEBEMAIL=user@localhost; \
+		debchange -t -l+$(DIST_TAG)u "Build for $(DIST)"; debchange -t --force-distribution -r -D $(DIST) $(DIST)
+	$(DEBIAN_PLUGIN_DIR)/scripts/clamp-changelog-entry-date $(CHROOT_DEBIAN_DIR)/changelog
 endif
 
+	sudo $(CHROOT_ENV) chroot $(CHROOT_DIR) su $(RUN_AS_USER) -c 'cd $(DIST_SRC_DEBIAN_DIR)/..; export LC_ALL=C; dpkg-buildpackage -sa -uc -us'
+
 ifneq (,$(DEBIAN_BUILD_DIRS))
 dist-copy-out:  release_name = $(shell $(DEBIAN_PARSER) changelog --package-release-name $(CHROOT_DEBIAN_DIR)/changelog)
 endif

scripts/clamp-changelog-entry-date

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Clamp the topmost changelog entry date ("Build for ...") to the previous one
+# (actual meaningful entry)
+
+CHANGELOG_PATH="$1"
+
+if [ ! -r "$CHANGELOG_PATH" ]; then
+    echo "Changelog file '$CHANGELOG_PATH' inaccessible!" >&2
+    exit 1
+fi
+
+# get previous date
+PREVIOUS_DATE=$(grep '^ --' $CHANGELOG_PATH |\
+    head -n 2 | tail -n 1 | grep -o '  .*')
+
+# replace topmost date
+sed -e "0,/^ --/s/^\( --.*\)\(  .*\)/\1$PREVIOUS_DATE/" -i $CHANGELOG_PATH
+touch --date="$PREVIOUS_DATE" "$CHANGELOG_PATH"

scripts/debian-changelog.sh

@@ -14,6 +14,10 @@
 #    package root directory differs from what is reported in changelog a 
 #    release is created, updating the changelog with commits since previous
 #    version and bumping the changelog version
+#
+# Addtionally, if the script is called with --verify option, it will only check
+# if the debian/changelog entry matches version/rel file and set appropriate
+# exit code.
 # -----------------------------------------------------------------------------
 # NOTES:
 #
@@ -64,6 +68,16 @@ if [ -z "$deb_revision" ]; then
     revision=""
 fi
 
+if [ "x$1" = "x--verify" ]; then
+    if [ "${deb_version}-${deb_revision}" = "${version}-${revision}" ]; then
+        exit 0
+    else
+        echo "Version mismatch: ${deb_version}-${deb_revision} in debian/changelog but ${version}-${revision} in version+rel" >&2
+        exit 1
+    fi
+fi
+
+
 # =============================================================================
 #                            R E L E A S E   M O D E 
 # =============================================================================