Skip to content

Commit

Permalink
Strip +dev suffix in plain upstream version
Browse files Browse the repository at this point in the history
Jenkins appends a `+dev<num>.<hash>` suffix to the upstream version
since we apply patches on the main branch instead of via
`debian/patches`. Strip that suffix like Debian does for their `+dfsg`
versioning to get the real upstream version.

https://phabricator.endlessm.com/T34488
  • Loading branch information
dbnicholson committed Apr 6, 2023
1 parent d80d14d commit 8bf2413
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ endif

deb_version := $(shell dpkg-parsechangelog | sed -ne "s/^Version: \(.*\)/\1/p")
upstream_version := $(shell echo $(deb_version) | sed -e "s/-[^-]*$$//")
plain_upstream_version := $(shell echo $(upstream_version) | sed -e "s/+dfsg.*//")
plain_upstream_version := $(shell echo $(upstream_version) | sed -e "s/+\(dfsg\|dev\).*//")

DBX_LIST = dbx.esl
DBX_HASHES = debian/$(distributor)-dbx.hashes
Expand Down

0 comments on commit 8bf2413

Please sign in to comment.