diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/rules | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index eee48263b..d4b2f1b48 100644 --- a/debian/changelog +++ b/debian/changelog | |||
| @@ -10,6 +10,7 @@ openssh (1:4.0p1-1) UNRELEASED; urgency=low | |||
| 10 | * Remove obsolete and unnecessary ssh/forward_warning debconf note. | 10 | * Remove obsolete and unnecessary ssh/forward_warning debconf note. |
| 11 | * Restore Hurd X forwarding fix from #102991, lost somewhere along the | 11 | * Restore Hurd X forwarding fix from #102991, lost somewhere along the |
| 12 | way. | 12 | way. |
| 13 | * Drop workaround for #242462 on amd64; it's been fixed properly upstream. | ||
| 13 | * debconf template translations: | 14 | * debconf template translations: |
| 14 | - Update Czech (thanks, Miroslav Kure; closes: #298744). | 15 | - Update Czech (thanks, Miroslav Kure; closes: #298744). |
| 15 | - Update Finnish (thanks, Matti Pöllä; closes: #303787). | 16 | - Update Finnish (thanks, Matti Pöllä; closes: #303787). |
diff --git a/debian/rules b/debian/rules index cfa791cdf..a35beeae8 100755 --- a/debian/rules +++ b/debian/rules | |||
| @@ -43,12 +43,6 @@ PAMSUBST := yes | |||
| 43 | PAMDEP := libpam-runtime | 43 | PAMDEP := libpam-runtime |
| 44 | endif | 44 | endif |
| 45 | 45 | ||
| 46 | # Temporary linkage hack for amd64 due to lack of res_query weak alias, see | ||
| 47 | # #242462. Real fix sent upstream. | ||
| 48 | ifeq ($(DEB_HOST_ARCH),amd64) | ||
| 49 | FORCE_LIBS = LIBS=-lresolv | ||
| 50 | endif | ||
| 51 | |||
| 52 | # Change the version string to include the Debian version | 46 | # Change the version string to include the Debian version |
| 53 | SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') | 47 | SSH_EXTRAVERSION := Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') |
| 54 | 48 | ||