2 files changed, 9 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 438046c06..d722516c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssh (1:3.8.1p1-10) experimental; urgency=low
+
+  * Don't install the ssh-askpass-gnome .desktop file by default; I've had
+    too many GNOME people tell me it's the wrong thing to be doing. I've
+    left it in /usr/share/doc/ssh-askpass-gnome/examples/ for now.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed, 25 Aug 2004 18:18:14 +0100
+
 openssh (1:3.8.1p1-9) experimental; urgency=low
 
   * Split the ssh binary package into openssh-client and openssh-server
diff --git a/debian/rules b/debian/rules
index 35bd678c7..8295fc05e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,7 +138,6 @@ install: build
                 install -s -o root -g root -m 755 contrib/gnome-ssh-askpass1 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass; \
         fi
         install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1
-        install -m 644 debian/ssh-askpass-gnome.desktop debian/ssh-askpass-gnome/usr/share/applications/ssh-askpass-gnome.desktop
         uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue
 
         install -m 755 debian/ssh-argv0 debian/openssh-client/usr/bin/ssh-argv0
@@ -237,6 +236,7 @@ binary-ssh-askpass-gnome: build install
         dh_testdir
         dh_testroot
         dh_installdocs
+        dh_installexamples debian/ssh-askpass-gnome.desktop
         dh_installchangelogs ChangeLog
         dh_strip
         dh_compress