[X2Go-Commits] [pale-moon] 01/01: debian/upstream.mk: strip out everything past a tilde character in the upstream version, because Palemoon's traditional packaging is... special/broken.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pale-moon.

commit b66d321b6220750b5a0459fb58082e7482eff150
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Sep 22 21:14:05 2018 +0200

    debian/upstream.mk: strip out everything past a tilde character in the upstream version, because Palemoon's traditional packaging is... special/broken.
    
    They shouldn't have used ~repack..., but rather -repack...
---
 debian/changelog   | 3 +++
 debian/upstream.mk | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b95543e..ba13179 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -254,6 +254,9 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Add xenial, artful, bionic, cosmic DIST values.
     - Uh, no, the Ubuntu versions are not backports. Fix that up.
     - Add Horizon support... whatever that is supposed to be.
+    - Strip out everything past a tilde character in the upstream version,
+      because Palemoon's traditional packaging is... special/broken. They
+      shouldn't have used ~repack..., but rather -repack...
   * debian/lintian-overrides:
     - Sync with Debian's Firefox package.
   * debian/palemoon.links.in:
diff --git a/debian/upstream.mk b/debian/upstream.mk
index 29091f1..0ad5abb 100644
--- a/debian/upstream.mk
+++ b/debian/upstream.mk
@@ -30,6 +30,9 @@ ifndef MOZ_BUILD_DATE
 export MOZ_BUILD_DATE := $(shell TZ=UTC date -d "$(shell dpkg-parsechangelog -S Date)" +%Y%m%d%H%M%S)
 endif
 UPSTREAM_RELEASE := $(firstword $(subst +, ,$(UPSTREAM_RELEASE)))
+# Strip out tilde-separated upstream parts.
+# This allows for having strings like "~repack..." in the upstream part of the version number.
+UPSTREAM_RELEASE := $(firstword $(subst ~, ,$(UPSTREAM_RELEASE)))
 # If the debian part of the version contains ~bpo or ~deb, it's a backport
 DEBIAN_RELEASE_EXTRA := $(word 2,$(subst ~, ,$(DEBIAN_RELEASE)))
 DIST = unknown

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git