Bug#335259: Bug #335259: openssh-client: Version control tag $OpenBSD:$ causes conflicts on upgrade

[Jari Aalto <jari.aalto@cante.net>]

tags 335259 + patch
thanks

[original bug: class important]

  Please remove version control tags from these files:

  moduli:1:#    $OpenBSD: moduli,v 1.3 2005/01/24 10:29:06 dtucker Exp $
  ssh_config:1:#	$OpenBSD: ssh_config,v 1.20 2005/01/28 09:45:53 dtucker Exp $

Here is patch to fix this. Please apply.

Jari

=== modified file 'debian/rules'
--- debian/rules        2006-12-01 09:19:57 +0000
+++ debian/rules        2006-12-01 11:16:42 +0000
@@ -165,6 +165,15 @@
        install -m 755 build-udeb/sshd debian/openssh-server-udeb/usr/sbin/sshd
        install -m 755 build-udeb/ssh-keygen debian/openssh-server-udeb/usr/bin/ssh-keygen

+       # Fixup: remove version control tags
+       grep -v '[$$]OpenBSD:' debian/openssh-client/etc/ssh/moduli \
+         > /tmp/moduli.$$$$.tmp \
+         && mv /tmp/moduli.$$$$.tmp debian/openssh-client/etc/ssh/moduli
+
+       grep -v '[$$]OpenBSD:' debian/openssh-client/etc/ssh/ssh_config \
+         > /tmp/ssh_config.$$$$.tmp \
+         && mv /tmp/ssh_config.$$$$.tmp debian/openssh-client/etc/ssh/ssh_config
+
 # Build architecture-independent files here.
 binary-indep: binary-ssh