This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit cbbd081c3b367a0a70364440e7f5e4935e097cc6 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Sep 21 04:13:10 2018 +0200 debian/upstream.mk: add version check against Debian package. --- debian/changelog | 2 ++ debian/upstream.mk | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index f198c9c..7c51fe8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -171,6 +171,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Sync with Debian's Firefox package. * debian/palemoon.install: - Enable preprocessing support. + * debian/upstream.mk: + - Add version check against Debian package. -- Mihai Moldovan <ionic@ionic.de> Mon, 28 May 2018 03:44:10 +0200 diff --git a/debian/upstream.mk b/debian/upstream.mk index ee0e36b..0bda9e0 100644 --- a/debian/upstream.mk +++ b/debian/upstream.mk @@ -8,6 +8,13 @@ include /usr/share/dpkg/pkg-info.mk +# The VERSION_FILTER transforms upstream version patterns to versions +# used in debian/changelog. Versions are to be transformed as follows: +# 4.0 -> 4.0 +# 4.0a1 -> 4.0~a1 +# 4.0b5 -> 4.0~b5 +# That should ensure the proper ordering +VERSION_FILTER := sed 's/\([0-9]\)\([ab]\)/\1~\2/g' $(call lazy,UPSTREAM_VERSION,$$(shell cat browser/config/version.txt)) # Last version in debian/changelog @@ -47,3 +54,10 @@ ifneq (,$(filter 10%,$(DEBIAN_TARGET))) DIST = buster endif endif + +# Check if the version in debian/changelog matches actual upstream version +# as VERSION_FILTER transforms it. +FILTERED_UPSTREAM_VERSION := $(shell echo $(UPSTREAM_VERSION) | $(VERSION_FILTER)) +ifneq ($(FILTERED_UPSTREAM_VERSION),$(subst esr,,$(firstword $(subst ~b, ,$(UPSTREAM_RELEASE))))) +$(error Upstream version in debian/changelog ($(UPSTREAM_RELEASE)) does not match actual upstream version ($(FILTERED_UPSTREAM_VERSION))) +endif -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git