summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-05-26 15:25:06 +0200
committerColin Watson <cjwatson@debian.org>2014-05-26 15:25:06 +0200
commit2586c9d388cb6683d8e987c298548fe0c0ebde00 (patch)
tree6c1e3a99b5e843305b7de5d30f07756a48b4e6bb /debian
parent80369572296f5ee3eaf6c3a3a066e3f33196f8e9 (diff)
Upgrade to debhelper v9.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rw-r--r--debian/compat2
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules1
4 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 4675e16d0..66d8c7a3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1openssh (1:6.6p1-6) UNRELEASED; urgency=medium
2
3 * Upgrade to debhelper v9.
4
5 -- Colin Watson <cjwatson@debian.org> Mon, 26 May 2014 09:23:51 +0100
6
1openssh (1:6.6p1-5) unstable; urgency=medium 7openssh (1:6.6p1-5) unstable; urgency=medium
2 8
3 * Force ssh-agent Upstart job to use sh syntax regardless of the user's 9 * Force ssh-agent Upstart job to use sh syntax regardless of the user's
diff --git a/debian/compat b/debian/compat
index 7f8f011eb..ec635144f 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
7 9
diff --git a/debian/control b/debian/control
index 80bc4eb8b..0ee91e6fa 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
2Section: net 2Section: net
3Priority: standard 3Priority: standard
4Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org> 4Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
5Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 8.1.0~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4) 5Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 9~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4)
6Standards-Version: 3.9.5 6Standards-Version: 3.9.5
7Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org> 7Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
8Homepage: http://www.openssh.org/ 8Homepage: http://www.openssh.org/
diff --git a/debian/rules b/debian/rules
index e05b31328..b85a8bc7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,7 @@ endif
61 61
62# Common path configuration. 62# Common path configuration.
63confflags += --sysconfdir=/etc/ssh 63confflags += --sysconfdir=/etc/ssh
64confflags += --libexecdir=\$${prefix}/lib/openssh
64 65
65# Common build options. 66# Common build options.
66confflags += --disable-strip 67confflags += --disable-strip