summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rwxr-xr-xdebian/rules5
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 689f4d420..6efa1d679 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
1openssh (1:6.2p2-5) UNRELEASED; urgency=low 1openssh (1:6.2p2-5) UNRELEASED; urgency=low
2 2
3 [ Colin Watson ]
3 * Document consequences of ssh-agent being setgid in ssh-agent(1); see 4 * Document consequences of ssh-agent being setgid in ssh-agent(1); see
4 #711623. 5 #711623.
5 * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and 6 * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and
6 ssh-argv0. 7 ssh-argv0.
7 8
9 [ Yolanda Robla ]
10 * debian/rules: Include real distribution in SSH_EXTRAVERSION instead of
11 hardcoding Debian (LP: #1195342).
12
8 -- Colin Watson <cjwatson@debian.org> Sat, 08 Jun 2013 22:12:27 +0100 13 -- Colin Watson <cjwatson@debian.org> Sat, 08 Jun 2013 22:12:27 +0100
9 14
10openssh (1:6.2p2-4) unstable; urgency=low 15openssh (1:6.2p2-4) unstable; urgency=low
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
42endif 42endif
43 43
44# Change the version string to include the Debian version 44# Change the version string to reflect distribution
45SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') 45DISTRIBUTION := $(shell dpkg-vendor --query vendor)
46SSH_EXTRAVERSION := $(DISTRIBUTION)-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
46 47
47DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi) 48DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi)
48ifeq ($(DISTRIBUTOR),Ubuntu) 49ifeq ($(DISTRIBUTOR),Ubuntu)