summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules4
3 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 1e1ace6e5..0423c8e53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ openssh (1:4.0p1-1) UNRELEASED; urgency=low
12 - Restore X forwarding fix from #102991, lost somewhere along the way. 12 - Restore X forwarding fix from #102991, lost somewhere along the way.
13 - Link with -lcrypt. 13 - Link with -lcrypt.
14 - Link with -lpthread rather than -pthread. 14 - Link with -lpthread rather than -pthread.
15 - Don't build ssh-askpass-gnome on the Hurd, until GNOME is available to
16 satisfy build-dependencies.
15 * Drop workaround for #242462 on amd64; it's been fixed properly upstream. 17 * Drop workaround for #242462 on amd64; it's been fixed properly upstream.
16 * debconf template translations: 18 * debconf template translations:
17 - Update Czech (thanks, Miroslav Kure; closes: #298744). 19 - Update Czech (thanks, Miroslav Kure; closes: #298744).
diff --git a/debian/control b/debian/control
index 96a98440f..78459c315 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
2Section: net 2Section: net
3Priority: standard 3Priority: standard
4Maintainer: Matthew Vernon <matthew@debian.org> 4Maintainer: Matthew Vernon <matthew@debian.org>
5Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 2), sharutils 5Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) [!hurd-i386] | libgnome-dev [!hurd-i386], libedit-dev, groff, debhelper (>= 2), sharutils [!hurd-i386]
6Standards-Version: 3.6.1 6Standards-Version: 3.6.1
7Uploaders: Colin Watson <cjwatson@debian.org> 7Uploaders: Colin Watson <cjwatson@debian.org>
8 8
@@ -75,7 +75,7 @@ Description: Secure shell client and server (transitional package)
75Package: ssh-askpass-gnome 75Package: ssh-askpass-gnome
76Section: gnome 76Section: gnome
77Priority: optional 77Priority: optional
78Architecture: any 78Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
79Depends: ${shlibs:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5 79Depends: ${shlibs:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5
80Replaces: ssh (<< 1:3.5p1-3) 80Replaces: ssh (<< 1:3.5p1-3)
81Provides: ssh-askpass 81Provides: ssh-askpass
diff --git a/debian/rules b/debian/rules
index 4e8117877..b5014be02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -143,6 +143,7 @@ install: build
143 install -m 644 -c contrib/ssh-copy-id.1 debian/openssh-client/usr/share/man/man1/ssh-copy-id.1 143 install -m 644 -c contrib/ssh-copy-id.1 debian/openssh-client/usr/share/man/man1/ssh-copy-id.1
144 install -m 644 debian/moduli.5 debian/openssh-client/usr/share/man/man5/moduli.5 144 install -m 644 debian/moduli.5 debian/openssh-client/usr/share/man/man5/moduli.5
145 145
146ifneq ($(DEB_HOST_ARCH_OS),gnu)
146 if [ -f contrib/gnome-ssh-askpass2 ]; then \ 147 if [ -f contrib/gnome-ssh-askpass2 ]; then \
147 install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass; \ 148 install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass; \
148 elif [ -f contrib/gnome-ssh-askpass1 ]; then \ 149 elif [ -f contrib/gnome-ssh-askpass1 ]; then \
@@ -150,6 +151,7 @@ install: build
150 fi 151 fi
151 install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1 152 install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1
152 uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue 153 uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue
154endif
153 155
154 install -m 755 debian/ssh-argv0 debian/openssh-client/usr/bin/ssh-argv0 156 install -m 755 debian/ssh-argv0 debian/openssh-client/usr/bin/ssh-argv0
155 install -m 644 debian/ssh-argv0.1 debian/openssh-client/usr/share/man/man1/ssh-argv0.1 157 install -m 644 debian/ssh-argv0.1 debian/openssh-client/usr/share/man/man1/ssh-argv0.1
@@ -168,7 +170,9 @@ binary-indep: binary-ssh
168 170
169# Build architecture-dependent files here. 171# Build architecture-dependent files here.
170binary-arch: binary-openssh-client binary-openssh-server 172binary-arch: binary-openssh-client binary-openssh-server
173ifneq ($(DEB_HOST_ARCH_OS),gnu)
171binary-arch: binary-ssh-askpass-gnome 174binary-arch: binary-ssh-askpass-gnome
175endif
172binary-arch: binary-openssh-client-udeb binary-openssh-server-udeb 176binary-arch: binary-openssh-client-udeb binary-openssh-server-udeb
173 177
174binary-openssh-client: DH_OPTIONS=-popenssh-client 178binary-openssh-client: DH_OPTIONS=-popenssh-client