From 01b166d6d7534b32ac2a35428d3616f2eabed03e Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla@canonical.com>
Date: Thu, 27 Jun 2013 15:24:06 +0100
Subject: debian/rules: Include real distribution in SSH_EXTRAVERSION instead
 of hardcoding Debian (LP: #1195342).

---
 debian/changelog | 5 +++++
 debian/rules     | 5 +++--
 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 @@
 openssh (1:6.2p2-5) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Document consequences of ssh-agent being setgid in ssh-agent(1); see
     #711623.
   * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and
     ssh-argv0.
 
+  [ Yolanda Robla ]
+  * debian/rules: Include real distribution in SSH_EXTRAVERSION instead of
+    hardcoding Debian (LP: #1195342).
+
  -- Colin Watson <cjwatson@debian.org>  Sat, 08 Jun 2013 22:12:27 +0100
 
 openssh (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),)
   endif
 endif
 
-# Change the version string to include the Debian version
-SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
+# Change the version string to reflect distribution
+DISTRIBUTION := $(shell dpkg-vendor --query vendor)
+SSH_EXTRAVERSION := $(DISTRIBUTION)-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
 
 DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi)
 ifeq ($(DISTRIBUTOR),Ubuntu)
-- 
cgit v1.2.3