diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:15:11 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:15:11 +0000 |
commit | 2e55dbb19964f69e0d3d3db52cd53c8912471e1a (patch) | |
tree | 0a81438c81f8d2712b2d15acf99c91d8c0bb519d | |
parent | e88de75a1a236779a10e8ccbcc51d25308be8840 (diff) |
Enable libedit support in sftp; build-depend on libedit-dev.
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rwxr-xr-x | debian/rules | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index ecef13b50..913e005ee 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,6 +1,8 @@ | |||
1 | openssh (1:4.0p1-1) UNRELEASED; urgency=low | 1 | openssh (1:4.0p1-1) UNRELEASED; urgency=low |
2 | 2 | ||
3 | * New upstream release. | 3 | * New upstream release. |
4 | - sftp supports command history and editing support using libedit | ||
5 | (closes: #287013). | ||
4 | * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU; | 6 | * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU; |
5 | closes: #296487). | 7 | closes: #296487). |
6 | * Remove obsolete and unnecessary ssh/forward_warning debconf note. | 8 | * Remove obsolete and unnecessary ssh/forward_warning debconf note. |
diff --git a/debian/control b/debian/control index 087fe72ff..96a98440f 100644 --- a/debian/control +++ b/debian/control | |||
@@ -2,7 +2,7 @@ Source: openssh | |||
2 | Section: net | 2 | Section: net |
3 | Priority: standard | 3 | Priority: standard |
4 | Maintainer: Matthew Vernon <matthew@debian.org> | 4 | Maintainer: Matthew Vernon <matthew@debian.org> |
5 | Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, groff, debhelper (>= 2), sharutils | 5 | Build-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 |
6 | Standards-Version: 3.6.1 | 6 | Standards-Version: 3.6.1 |
7 | Uploaders: Colin Watson <cjwatson@debian.org> | 7 | Uploaders: Colin Watson <cjwatson@debian.org> |
8 | 8 | ||
diff --git a/debian/rules b/debian/rules index 6a3f31420..cfa791cdf 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -58,7 +58,7 @@ build-deb: build-deb-stamp | |||
58 | build-deb-stamp: | 58 | build-deb-stamp: |
59 | dh_testdir | 59 | dh_testdir |
60 | mkdir -p build-deb | 60 | mkdir -p build-deb |
61 | cd build-deb && $(FORCE_LIBS) ../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=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper | 61 | cd build-deb && $(FORCE_LIBS) ../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=/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin --with-superuser-path=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin --with-pam --with-4in6 --with-privsep-path=/var/run/sshd --without-rand-helper --with-libedit |
62 | 62 | ||
63 | # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). | 63 | # Some 2.2 kernels have trouble with setres[ug]id() (bug #239999). |
64 | perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h | 64 | perl -pi -e 's/.*#undef (BROKEN_SETRES[UG]ID).*/#define $$1 1/' build-deb/config.h |