1 files changed, 6 insertions, 10 deletions

diff --git a/debian/rules b/debian/rules
index fb60b2270..42ecea8ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ build-stamp:
         fi
         ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/lib --mandir=/usr/share/man --with-tcp-wrappers --with-xauth=/usr/bin/X11/xauth --with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-ipv4-default \
                 --with-privsep-path=/var/run/sshd  --without-rand-helper
-        $(MAKE) -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-O2 -g -Wall -DLOGIN_PROGRAM=\"/bin/login\" -DSSHD_PAM_SERVICE=\"ssh\" -D__FILE_OFFSET_BITS=64 -DHAVE_MMAP_ANON_SHARED' \
+        $(MAKE) -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='-O2 -g -Wall -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -D__FILE_OFFSET_BITS=64 -DHAVE_MMAP_ANON_SHARED' \
                 SSH_KEYSIGN='/usr/lib/ssh-keysign'
         $(MAKE) -C contrib gnome-ssh-askpass1 CC='gcc -O2'
 
@@ -45,25 +45,25 @@ install: build
         dh_installdirs
 
         # Add here commands to install the package into debian/tmp.
-        $(MAKE) DESTDIR=`pwd`/debian/tmp install
+        $(MAKE) DESTDIR=`pwd`/debian/tmp install-nokeys
 
-        rm -f debian/tmp/etc/ssh/ssh_host_*key*
         rm -f debian/tmp/etc/ssh/sshd_config
         #Temporary hack: remove /usr/share/Ssh.bin, since we have no smartcard support anyway.
         rm -f debian/tmp/usr/share/Ssh.bin
 
         install -m 755 contrib/ssh-copy-id debian/tmp/usr/bin/ssh-copy-id
         install -m 644 -c contrib/ssh-copy-id.1 debian/tmp/usr/share/man/man1/ssh-copy-id.1
-        install -m 644 debian/gnome-ssh-askpass.1 debian/tmp/usr/share/man/man1/gnome-ssh-askpass.1
 
         install -s -o root -g root -m 755 contrib/gnome-ssh-askpass1 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass
+        install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1
+
+        install -m 755 debian/ssh-argv0 debian/tmp/usr/bin/ssh-argv0
+        install -m 644 debian/ssh-argv0.1 debian/tmp/usr/share/man/man1/ssh-argv0.1
 
         install -o root -g root debian/init debian/tmp/etc/init.d/ssh
 
         install -o root -g root -m 755 -d debian/tmp/var/run/sshd
 
-        dh_movefiles
-
 # Build architecture-independent files here.
 binary-indep: build install
         # nothing to do
@@ -75,16 +75,12 @@ binary-arch: build install
         dh_installdebconf
         dh_installdocs OVERVIEW README
         cat debian/copyright.head LICENCE > debian/tmp/usr/share/doc/ssh/copyright
-        dh_installexamples
-        dh_installmenu
         nroff RFC.nroff > debian/tmp/usr/share/doc/ssh/RFC
         gzip -9 debian/tmp/usr/share/doc/ssh/RFC
         rm -rf debian/tmp/usr/share/doc/ssh/RFC.nroff.gz
         dh_installpam
-        dh_installcron
         dh_installchangelogs ChangeLog
         dh_strip
-        dh_link
         dh_compress
         dh_fixperms
         dh_installdeb