2 files changed, 10 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 9672dc4a3..253cde90f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:3.6.1p2-6) UNRELEASED; urgency=low
+
+  * Use a more CVS-friendly means of setting SSH_VERSION.
+
+ -- Colin Watson <cjwatson@debian.org>  Mon,  1 Sep 2003 23:56:57 +0100
+
 openssh (1:3.6.1p2-5) unstable; urgency=low
 
   * Disable cmsg_type check for file descriptor passing when running on
diff --git a/debian/rules b/debian/rules
index 9ddaf5a80..ec594ecb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,17 +25,15 @@ PO2DEBCONF := yes
 MINDEBCONFVER := 1.2.0
 endif
 
+# Change the version string to include the Debian version
+SSH_VERSION := $(shell sed -e '/define/!d; s/.*\"\(.*\)\".*/\1/; q' <version.h) Debian $(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p')
+
 build: build-stamp
 build-stamp:
         dh_testdir
-#Change the version string to include the Debian Version
-        if <version.h sed -e "/define/s/\"\(.*\)\"/\"\1 Debian `dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p'`\"/" >version.h.new; \
-        then mv version.h version.h.upstream; mv version.h.new version.h; \
-        else echo "Version number change failed"; exit 1; \
-        fi
         ./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
-        $(MAKE) -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -fno-builtin-log -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -D__FILE_OFFSET_BITS=64 -DHAVE_MMAP_ANON_SHARED' \
+        $(MAKE) -j 2 ASKPASS_PROGRAM='/usr/bin/ssh-askpass' CFLAGS='$(OPTFLAGS) -g -Wall -fno-builtin-log -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT -DSSHD_PAM_SERVICE=\"ssh\" -D__FILE_OFFSET_BITS=64 -DHAVE_MMAP_ANON_SHARED -DSSH_VERSION="\"$(SSH_VERSION)\""' \
                 SSH_KEYSIGN='/usr/lib/ssh-keysign'
         # Support building on Debian 3.0 (with GNOME 1.4) and later.
         if [ -f /usr/include/libgnomeui-2.0/gnome.h ]; then \
@@ -52,8 +50,6 @@ clean:
         -$(MAKE) -i distclean
         -$(MAKE) -C contrib clean
         rm -f config.log
-        if [ -f version.h.upstream ]; then mv version.h.upstream version.h; \
-        fi
 ifeq ($(PO2DEBCONF),yes)
         # Hack for woody compatibility. This makes sure that the
         # debian/templates file shipped in the source package doesn't