diff options
| author | Yolanda Robla <yolanda.robla@canonical.com> | 2013-06-27 15:24:06 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-06-27 15:24:06 +0100 |
| commit | 01b166d6d7534b32ac2a35428d3616f2eabed03e (patch) | |
| tree | c3ca492e55659b060418aa9b823399476296e223 /debian/rules | |
| parent | ed1b8fa3b2e14f180b43e6cf3a5896f16e421031 (diff) | |
debian/rules: Include real distribution in SSH_EXTRAVERSION instead of
hardcoding Debian (LP: #1195342).
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index 7db1e3c4b..cb7932e3b 100755 --- a/debian/rules +++ b/debian/rules | |||
| @@ -41,8 +41,9 @@ ifeq ($(DEB_HOST_ARCH_OS),) | |||
| 41 | endif | 41 | endif |
| 42 | endif | 42 | endif |
| 43 | 43 | ||
| 44 | # Change the version string to include the Debian version | 44 | # Change the version string to reflect distribution |
| 45 | SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') | 45 | DISTRIBUTION := $(shell dpkg-vendor --query vendor) |
| 46 | SSH_EXTRAVERSION := $(DISTRIBUTION)-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') | ||
| 46 | 47 | ||
| 47 | DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi) | 48 | DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi) |
| 48 | ifeq ($(DISTRIBUTOR),Ubuntu) | 49 | ifeq ($(DISTRIBUTOR),Ubuntu) |