summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/Makefile4
-rw-r--r--debian/changelog6
2 files changed, 8 insertions, 2 deletions
diff --git a/contrib/Makefile b/contrib/Makefile
index 2cef46f6c..00e96e7b9 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -7,9 +7,9 @@ gnome-ssh-askpass1: gnome-ssh-askpass1.c
7 `gnome-config --libs gnome gnomeui` 7 `gnome-config --libs gnome gnomeui`
8 8
9gnome-ssh-askpass2: gnome-ssh-askpass2.c 9gnome-ssh-askpass2: gnome-ssh-askpass2.c
10 $(CC) `pkg-config --cflags gtk+-2.0` \ 10 $(CC) `pkg-config --cflags gtk+-2.0 x11` \
11 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \ 11 gnome-ssh-askpass2.c -o gnome-ssh-askpass2 \
12 `pkg-config --libs gtk+-2.0` 12 `pkg-config --libs gtk+-2.0 x11`
13 13
14clean: 14clean:
15 rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass 15 rm -f *.o gnome-ssh-askpass1 gnome-ssh-askpass2 gnome-ssh-askpass
diff --git a/debian/changelog b/debian/changelog
index 74b7c6191..7f118e41e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1openssh (1:5.1p1-9) UNRELEASED; urgency=low
2
3 * Use x11.pc when compiling/linking gnome-ssh-askpass2 (closes: #555951).
4
5 -- Colin Watson <cjwatson@debian.org> Thu, 12 Nov 2009 21:31:44 +0000
6
1openssh (1:5.1p1-8) unstable; urgency=low 7openssh (1:5.1p1-8) unstable; urgency=low
2 8
3 * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi; 9 * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi;