summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
-rw-r--r--debian/openssh-client.dirs1
-rwxr-xr-x[-rw-r--r--]debian/openssh-client.install10
-rw-r--r--debian/openssh-server.dirs3
-rwxr-xr-x[-rw-r--r--]debian/openssh-server.install8
-rwxr-xr-xdebian/rules13
-rw-r--r--debian/ssh-askpass-gnome.dirs2
-rwxr-xr-x[-rw-r--r--]debian/ssh-askpass-gnome.install2
9 files changed, 22 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 84eef3ea6..9ae2a48d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ openssh (1:6.6p1-7) UNRELEASED; urgency=medium
2 2
3 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules 3 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules
4 directly. 4 directly.
5 * Use dh-exec to simplify override_dh_install target.
5 6
6 -- Colin Watson <cjwatson@debian.org> Sun, 20 Jul 2014 21:42:58 +0100 7 -- Colin Watson <cjwatson@debian.org> Sun, 20 Jul 2014 21:42:58 +0100
7 8
diff --git a/debian/control b/debian/control
index 0ee91e6fa..7e7a64b5d 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 (>= 9~), 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~), dh-exec, 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/openssh-client.dirs b/debian/openssh-client.dirs
deleted file mode 100644
index bbe54c691..000000000
--- a/debian/openssh-client.dirs
+++ /dev/null
@@ -1 +0,0 @@
1usr/share/apport/package-hooks
diff --git a/debian/openssh-client.install b/debian/openssh-client.install
index 6a8060000..18e529f64 100644..100755
--- a/debian/openssh-client.install
+++ b/debian/openssh-client.install
@@ -1,3 +1,5 @@
1#! /usr/bin/dh-exec
2
1etc/ssh/moduli 3etc/ssh/moduli
2etc/ssh/ssh_config 4etc/ssh/ssh_config
3usr/bin/scp 5usr/bin/scp
@@ -25,3 +27,11 @@ usr/share/man/man8/ssh-pkcs11-helper.8
25 27
26contrib/ssh-copy-id usr/bin 28contrib/ssh-copy-id usr/bin
27debian/ssh-argv0 usr/bin 29debian/ssh-argv0 usr/bin
30
31# dh_apport would be neater, but at the time of writing it isn't in unstable
32# yet.
33debian/openssh-client.apport => usr/share/apport/package-hooks/openssh-client.py
34
35# Upstart user job (only used under user sessions).
36debian/ssh-agent.user-session.upstart => usr/share/upstart/sessions/ssh-agent.conf
37
diff --git a/debian/openssh-server.dirs b/debian/openssh-server.dirs
index 7a3743680..859d1a393 100644
--- a/debian/openssh-server.dirs
+++ b/debian/openssh-server.dirs
@@ -1,9 +1,6 @@
1etc/init.d 1etc/init.d
2etc/default 2etc/default
3etc/network/if-up.d
4etc/ufw/applications.d
5usr/lib/openssh 3usr/lib/openssh
6usr/sbin 4usr/sbin
7usr/share/apport/package-hooks
8usr/share/man/man5 5usr/share/man/man5
9usr/share/man/man8 6usr/share/man/man8
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
index 149222dad..06e0c71b7 100644..100755
--- a/debian/openssh-server.install
+++ b/debian/openssh-server.install
@@ -1,8 +1,16 @@
1#! /usr/bin/dh-exec
2
1usr/sbin/sshd 3usr/sbin/sshd
2usr/share/man/man5/authorized_keys.5 4usr/share/man/man5/authorized_keys.5
3usr/share/man/man5/sshd_config.5 5usr/share/man/man5/sshd_config.5
4usr/share/man/man8/sshd.8 6usr/share/man/man8/sshd.8
5 7
8debian/openssh-server.if-up => etc/network/if-up.d/openssh-server
9debian/openssh-server.ufw.profile => etc/ufw/applications.d/openssh-server
6debian/systemd/ssh.socket lib/systemd/system 10debian/systemd/ssh.socket lib/systemd/system
7debian/systemd/ssh@.service lib/systemd/system 11debian/systemd/ssh@.service lib/systemd/system
8debian/systemd/sshd.conf usr/lib/tmpfiles.d 12debian/systemd/sshd.conf usr/lib/tmpfiles.d
13
14# dh_apport would be neater, but at the time of writing it isn't in unstable
15# yet.
16debian/openssh-server.apport => usr/share/apport/package-hooks/openssh-server.py
diff --git a/debian/rules b/debian/rules
index 3419366c3..efd9ee74a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -168,25 +168,12 @@ override_dh_install:
168 dh_install -popenssh-client-udeb -popenssh-server-udeb \ 168 dh_install -popenssh-client-udeb -popenssh-server-udeb \
169 --sourcedir=build-udeb 169 --sourcedir=build-udeb
170 170
171 install -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass
172
173 install -o root -g root debian/openssh-server.if-up debian/openssh-server/etc/network/if-up.d/openssh-server
174 install -o root -g root -m 644 debian/openssh-server.ufw.profile debian/openssh-server/etc/ufw/applications.d/openssh-server
175
176 # Remove version control tags to avoid unnecessary conffile 171 # Remove version control tags to avoid unnecessary conffile
177 # resolution steps for administrators. 172 # resolution steps for administrators.
178 sed -i '/\$$OpenBSD:/d' \ 173 sed -i '/\$$OpenBSD:/d' \
179 debian/openssh-client/etc/ssh/moduli \ 174 debian/openssh-client/etc/ssh/moduli \
180 debian/openssh-client/etc/ssh/ssh_config 175 debian/openssh-client/etc/ssh/ssh_config
181 176
182 # dh_apport would be neater, but at the time of writing it isn't in
183 # unstable yet.
184 install -p -m 644 debian/openssh-client.apport debian/openssh-client/usr/share/apport/package-hooks/openssh-client.py
185 install -p -m 644 debian/openssh-server.apport debian/openssh-server/usr/share/apport/package-hooks/openssh-server.py
186
187 # Upstart user job (only used under user sessions)
188 install -p -m 644 -D debian/ssh-agent.user-session.upstart debian/openssh-client/usr/share/upstart/sessions/ssh-agent.conf
189
190override_dh_installdocs: 177override_dh_installdocs:
191 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server -Nssh 178 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server -Nssh
192 dh_installdocs -popenssh-server -popenssh-sftp-server -pssh \ 179 dh_installdocs -popenssh-server -popenssh-sftp-server -pssh \
diff --git a/debian/ssh-askpass-gnome.dirs b/debian/ssh-askpass-gnome.dirs
index 0ffa45024..fcf16f2d6 100644
--- a/debian/ssh-askpass-gnome.dirs
+++ b/debian/ssh-askpass-gnome.dirs
@@ -1,3 +1 @@
1usr/lib/openssh
2usr/share/man/man1 usr/share/man/man1
3usr/share/pixmaps
diff --git a/debian/ssh-askpass-gnome.install b/debian/ssh-askpass-gnome.install
index 8b6b5f045..9b0a8fd8d 100644..100755
--- a/debian/ssh-askpass-gnome.install
+++ b/debian/ssh-askpass-gnome.install
@@ -1 +1,3 @@
1#! /usr/bin/dh-exec
2contrib/gnome-ssh-askpass2 => usr/lib/openssh/gnome-ssh-askpass
1debian/ssh-askpass-gnome.png usr/share/pixmaps 3debian/ssh-askpass-gnome.png usr/share/pixmaps