diff options
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | debian/rules | 2 | ||||
-rwxr-xr-x | debian/ssh-askpass-gnome.install | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index a9f8f815e..e9b297f26 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -135,6 +135,7 @@ openssh (1:7.4p1-1) UNRELEASED; urgency=medium | |||
135 | * Remove redundant "GSSAPIDelegateCredentials no" from ssh_config (already | 135 | * Remove redundant "GSSAPIDelegateCredentials no" from ssh_config (already |
136 | the upstream default), and document that setting ServerAliveInterval to | 136 | the upstream default), and document that setting ServerAliveInterval to |
137 | 300 by default if BatchMode is set is Debian-specific (closes: #765630). | 137 | 300 by default if BatchMode is set is Debian-specific (closes: #765630). |
138 | * Build gnome-ssh-askpass with GTK+ 3 (LP: #801187). | ||
138 | 139 | ||
139 | -- Colin Watson <cjwatson@debian.org> Mon, 05 Dec 2016 19:31:33 +0000 | 140 | -- Colin Watson <cjwatson@debian.org> Mon, 05 Dec 2016 19:31:33 +0000 |
140 | 141 | ||
diff --git a/debian/control b/debian/control index 828d36269..411731a4a 100644 --- a/debian/control +++ b/debian/control | |||
@@ -10,7 +10,7 @@ Build-Depends: autotools-dev, | |||
10 | dpkg-dev (>= 1.16.1~), | 10 | dpkg-dev (>= 1.16.1~), |
11 | libaudit-dev [linux-any], | 11 | libaudit-dev [linux-any], |
12 | libedit-dev, | 12 | libedit-dev, |
13 | libgtk2.0-dev, | 13 | libgtk-3-dev, |
14 | libkrb5-dev | heimdal-dev, | 14 | libkrb5-dev | heimdal-dev, |
15 | libpam0g-dev | libpam-dev, | 15 | libpam0g-dev | libpam-dev, |
16 | libselinux1-dev [linux-any], | 16 | libselinux1-dev [linux-any], |
diff --git a/debian/rules b/debian/rules index 86d15a0d0..34701bb22 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -146,7 +146,7 @@ override_dh_auto_build-arch: | |||
146 | $(MAKE) -C debian/build-deb-ssh1 $(PARALLEL) SSH_PROGRAM='/usr/bin/ssh1' ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen | 146 | $(MAKE) -C debian/build-deb-ssh1 $(PARALLEL) SSH_PROGRAM='/usr/bin/ssh1' ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen |
147 | $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen | 147 | $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen |
148 | 148 | ||
149 | $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) | 149 | $(MAKE) -C contrib gnome-ssh-askpass3 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) |
150 | 150 | ||
151 | override_dh_auto_build-indep: | 151 | override_dh_auto_build-indep: |
152 | 152 | ||
diff --git a/debian/ssh-askpass-gnome.install b/debian/ssh-askpass-gnome.install index 9b0a8fd8d..8715aafaf 100755 --- a/debian/ssh-askpass-gnome.install +++ b/debian/ssh-askpass-gnome.install | |||
@@ -1,3 +1,3 @@ | |||
1 | #! /usr/bin/dh-exec | 1 | #! /usr/bin/dh-exec |
2 | contrib/gnome-ssh-askpass2 => usr/lib/openssh/gnome-ssh-askpass | 2 | contrib/gnome-ssh-askpass3 => usr/lib/openssh/gnome-ssh-askpass |
3 | debian/ssh-askpass-gnome.png usr/share/pixmaps | 3 | debian/ssh-askpass-gnome.png usr/share/pixmaps |