Merge ~paride/curtin:deb-rules-drop-pkgversion into curtin:master

Proposed by Paride Legovini
Status: Merged
Approved by: Chad Smith
Approved revision: dad38a2639a21e2a78addc1fe1808e518db96935
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~paride/curtin:deb-rules-drop-pkgversion
Merge into: curtin:master
Diff against target: 13 lines (+0/-2)
1 file modified
debian/rules (+0/-2)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chad Smith Approve
Review via email: mp+392370@code.launchpad.net

Commit message

debian/rules: drop PKG_VERSION and UPSTREAM_VERSION

The PKG_VERSION variable in debian/rules is not used and the command
generating it doesn't work, causing a 'Bad substitution' error at
every build. (The problem is with the '\#\#' escape.)

Also drop UPSTREAM_VERSION (unused).

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Chad Smith (chad.smith) wrote :

Shouldn't we remove UPSTREAM_VERSION too?

review: Needs Fixing
dad38a2... by Paride Legovini

debian/rules: drop UPSTREAM_VERSION (unused)

Revision history for this message
Paride Legovini (paride) wrote :

Right! MP and commit message updated.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Chad Smith (chad.smith) wrote :

+1

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Server Team CI bot (server-team-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/rules b/debian/rules
2index c421771..933c8e4 100755
3--- a/debian/rules
4+++ b/debian/rules
5@@ -3,8 +3,6 @@
6 PY3VERS := $(shell py3versions -r)
7
8 DEB_VERSION := $(shell dpkg-parsechangelog --show-field=Version)
9-UPSTREAM_VERSION := $(shell x="$(DEB_VERSION)"; echo "$${x%-*}")
10-PKG_VERSION := $(shell x="$(DEB_VERSION)"; echo "$${x\#\#*-}")
11
12 %:
13 dh $@ --with=python3

Subscribers

People subscribed via source and target branches