diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2017-07-28 16:14:20 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2017-08-03 17:18:32 +0100 |
| commit | 7b2fcb3f0e78e8abe77336f5687ce876e49efeb2 (patch) | |
| tree | b1acd6e75745282f31e3af862f7005efda729367 | |
| parent | 0f23eda7c3f900cfeb7f1435c6410607dfbb8364 (diff) | |
Fix upstream version parsing
The sed regex is greedy, so 17.08-rc2-0vyatta1 returns 17.08-rc2.
Match everything until the separator instead.
Also use dpkg-parsechangelog --show-field Version to simplify it
further. It's available since dpkg-dev 17.0 which is in both
Ubuntu 14.04 and Debian 8.
Change-Id: Ie3ef44b5573d6ee586e8cf291f307c0539976ead
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
| -rwxr-xr-x | debian/rules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/rules b/debian/rules index b1af5222..25d77e08 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ export DH_VERBOSE=1 export DH_OPTIONS=-v -VERSION := $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p') +VERSION := $(shell dpkg-parsechangelog --show-field Version | sed -nr 's/(.*:)?([^-])(-.*)/\2/p') DPDK_ABI := $(shell echo $(VERSION) | cut -d '.' -f1-2) # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/* |