summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rwxr-xr-xdebian/rules2
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 2c153848f..993fffc7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
1openssh (1:3.8.1p1-8.sarge.2) UNRELEASED; urgency=low 1openssh (1:3.8.1p1-8.sarge.2) UNRELEASED; urgency=low
2 2
3 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754). 3 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
4 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
5 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
6 implementations apparently have problems with the long version string.
7 This is of course a bug in those implementations, but since the extent
8 of the problem is unknown it's best to play safe (closes: #275731).
4 * debconf template translations: 9 * debconf template translations:
5 - Add Finnish (thanks, Matti Pöllä; closes: #265339). 10 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
6 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895). 11 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
diff --git a/debian/rules b/debian/rules
index 4960ad921..06a661239 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ FORCE_LIBS = LIBS=-lresolv
50endif 50endif
51 51
52# Change the version string to include the Debian version 52# Change the version string to include the Debian version
53SSH_VERSION := $(shell sed -e '/define/!d; s/.*\"\(.*\)\".*/\1/; q' <version.h) Debian $(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p') 53SSH_VERSION := $(shell sed -e '/define/!d; s/.*\"\(.*\)\".*/\1/; q' <version.h) Debian-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//')
54 54
55build: build-deb build-udeb 55build: build-deb build-udeb
56 56