summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/rules1
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 97b001897..84eef3ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:6.6p1-7) UNRELEASED; urgency=medium
2
3 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules
4 directly.
5
6 -- Colin Watson <cjwatson@debian.org> Sun, 20 Jul 2014 21:42:58 +0100
7
1openssh (1:6.6p1-6) unstable; urgency=medium 8openssh (1:6.6p1-6) unstable; urgency=medium
2 9
3 * Upgrade to debhelper v9. 10 * Upgrade to debhelper v9.
diff --git a/debian/rules b/debian/rules
index f4d010377..3419366c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ endif
21 21
22DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) 22DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
23DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) 23DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
24DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
24 25
25ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) 26ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
26 CC := gcc 27 CC := gcc