This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 72f3262471c99d8748cb0023bb2d1b24cdc2f672 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Sep 21 04:57:43 2018 +0200 debian/upstream.mk: uh, no, the Ubuntu versions are not backports. Fix that up. --- debian/changelog | 1 + debian/upstream.mk | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index a67146a..6b02b43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -183,6 +183,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium * debian/upstream.mk: - Add version check against Debian package. - Add xenial, artful, bionic, cosmic DIST values. + - Uh, no, the Ubuntu versions are not backports. Fix that up. * debian/lintian-overrides: - Sync with Debian's Firefox package. diff --git a/debian/upstream.mk b/debian/upstream.mk index 902d6ca..497b738 100644 --- a/debian/upstream.mk +++ b/debian/upstream.mk @@ -39,6 +39,18 @@ endif ifneq (,$(filter testing% buster% unstable sid,$(DEB_DISTRIBUTION))) DIST = buster endif +ifneq (,$(filter xenial,$(DEB_DISTRIBUTION))) +DIST = xenial +endif +ifneq (,$(filter artful,$(DEB_DISTRIBUTION))) +DIST = artful +endif +ifneq (,$(filter bionic,$(DEB_DISTRIBUTION))) +DIST = bionic +endif +ifneq (,$(filter cosmic,$(DEB_DISTRIBUTION))) +DIST = cosmic +endif ifneq (,$(filter bpo% deb%,$(DEBIAN_RELEASE_EXTRA))) DEBIAN_TARGET := $(subst bpo,,$(subst deb,,$(DEBIAN_RELEASE_EXTRA))) ifneq (,$(filter 7%,$(DEBIAN_TARGET))) @@ -53,18 +65,6 @@ endif ifneq (,$(filter 10%,$(DEBIAN_TARGET))) DIST = buster endif -ifneq (,$(filter 16.04%,$(DEBIAN_TARGET))) -DIST = xenial -endif -ifneq (,$(filter 17.10%,$(DEBIAN_TARGET))) -DIST = artful -endif -ifneq (,$(filter 18.04%,$(DEBIAN_TARGET))) -DIST = bionic -endif -ifneq (,$(filter 18.10%,$(DEBIAN_TARGET))) -DIST = cosmic -endif endif # Check if the version in debian/changelog matches actual upstream version -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git