summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2005-06-17 12:54:27 +0000
committerColin Watson <cjwatson@debian.org>2005-06-17 12:54:27 +0000
commit9f1f01b99b99dab589f2ddba6a7a2010fd710fc7 (patch)
tree264886c745fc6d75ad1ec3ecd8b11977e8fb43d1
parentfb43af7fc130223721e0e9cb80575663e36bd4a8 (diff)
Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies
are available.
-rw-r--r--debian/changelog2
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules4
3 files changed, 4 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 676046319..235b1462a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ openssh (1:4.1p1-4) UNRELEASED; urgency=low
13 security context for the generated public key files. 13 security context for the generated public key files.
14 - Added a comment to /etc/pam.d/ssh to indicate that an SELinux system 14 - Added a comment to /etc/pam.d/ssh to indicate that an SELinux system
15 may want to also include pam_selinux.so. 15 may want to also include pam_selinux.so.
16 * Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies
17 are available.
16 * debconf template translations: 18 * debconf template translations:
17 - Update German (thanks, Jens Seidel; closes: #313949). 19 - Update German (thanks, Jens Seidel; closes: #313949).
18 20
diff --git a/debian/control b/debian/control
index de945cf9c..bd12f1d6e 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) [!hurd-i386] | libgnome-dev [!hurd-i386], libedit-dev, groff, debhelper (>= 2), sharutils [!hurd-i386], libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc] 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, libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc]
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: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc 78Architecture: any
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 772d08f84..d72dc2d68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,7 +149,6 @@ install: build
149 install -m 644 -c contrib/ssh-copy-id.1 debian/openssh-client/usr/share/man/man1/ssh-copy-id.1 149 install -m 644 -c contrib/ssh-copy-id.1 debian/openssh-client/usr/share/man/man1/ssh-copy-id.1
150 install -m 644 debian/moduli.5 debian/openssh-client/usr/share/man/man5/moduli.5 150 install -m 644 debian/moduli.5 debian/openssh-client/usr/share/man/man5/moduli.5
151 151
152ifneq ($(DEB_HOST_ARCH_OS),hurd)
153 if [ -f contrib/gnome-ssh-askpass2 ]; then \ 152 if [ -f contrib/gnome-ssh-askpass2 ]; then \
154 install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass; \ 153 install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass; \
155 elif [ -f contrib/gnome-ssh-askpass1 ]; then \ 154 elif [ -f contrib/gnome-ssh-askpass1 ]; then \
@@ -157,7 +156,6 @@ ifneq ($(DEB_HOST_ARCH_OS),hurd)
157 fi 156 fi
158 install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1 157 install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1
159 uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue 158 uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue
160endif
161 159
162 install -m 755 debian/ssh-argv0 debian/openssh-client/usr/bin/ssh-argv0 160 install -m 755 debian/ssh-argv0 debian/openssh-client/usr/bin/ssh-argv0
163 install -m 644 debian/ssh-argv0.1 debian/openssh-client/usr/share/man/man1/ssh-argv0.1 161 install -m 644 debian/ssh-argv0.1 debian/openssh-client/usr/share/man/man1/ssh-argv0.1
@@ -176,9 +174,7 @@ binary-indep: binary-ssh
176 174
177# Build architecture-dependent files here. 175# Build architecture-dependent files here.
178binary-arch: binary-openssh-client binary-openssh-server 176binary-arch: binary-openssh-client binary-openssh-server
179ifneq ($(DEB_HOST_ARCH_OS),hurd)
180binary-arch: binary-ssh-askpass-gnome 177binary-arch: binary-ssh-askpass-gnome
181endif
182binary-arch: binary-openssh-client-udeb binary-openssh-server-udeb 178binary-arch: binary-openssh-client-udeb binary-openssh-server-udeb
183 179
184binary-openssh-client: DH_OPTIONS=-popenssh-client 180binary-openssh-client: DH_OPTIONS=-popenssh-client