[X2Go-Commits] [x2goclient] 01/01: debian/rules; fix version detection on testing and unstable V2.

[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 x2goclient.

commit 0803f2af572b226293903085b92d4e75cd1c878b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 3 04:49:35 2022 +0100

    debian/rules; fix version detection on testing and unstable V2.
    
    Remove a= tag.
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1c9a107..a4e11fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -183,6 +183,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium
     + Fix version detection on testing and unstable. lsb_release -r currently
       only outputs n/a on these suites, so fall back to a rather fragile
       detection via apt-cache policy instead.
+    + Fix version detection on testing and unstable V2. Remove a= tag.
   * debian/:
     + New file "watch". We won't need this per se (since we're upstream and
       there cannot be a newer version of the Debian package without releasing
diff --git a/debian/rules b/debian/rules
index d26a2d4..59aa952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ else
       # This is also why we can just drop any suites/archive names (this is
       # what a= means) containing a dash character (e.g., "stable-updates")
       # and only pick the first match.
-      RELEASE_VER := $(shell /usr/bin/apt-cache policy | grep -E 'o=(De|Rasp)bian,' | grep -E 'l=(De|Rasp)bian,' | grep -F 'c=main,' | grep -Eo 'a=[^, ]*' | grep -v -- '-' | head -n '1')
+      RELEASE_VER := $(shell /usr/bin/apt-cache policy | grep -E 'o=(De|Rasp)bian,' | grep -E 'l=(De|Rasp)bian,' | grep -F 'c=main,' | grep -Eo 'a=[^, ]*' | sed -e 's/^a=//' | grep -v -- '-' | head -n '1')
 
       # Do error checking.
       ifneq ($(RELEASE_VER),testing)

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