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

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

Package: openssh-client
Version: 1:4.2p1-5
Severity: normal

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 $

They cause triggering unnecessary conflict resolution like:

    Configuration file `/etc/ssh/moduli'
     ==> File on system created by you or by a script.
     ==> File also in package provided by package maintainer.
       What would you like to do about it ?  Your options are:
	Y or I  : install the package maintainer's version
	N or O  : keep your currently-installed version
	  D     : show the differences between the versions
	  Z     : background this process to examine the situation
     The default action is to keep your current version.
    *** moduli (Y/I/N/O/D/Z) [default=N] ? 

In addition, if those files are imported to sysadms own version control
those tags may possibly cause conflicts as well. The files under /etc
shoudl be considered local to the system, where outside information
is removed.

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (990, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.12-1-686
Locale: LANG=C, LC_CTYPE=C (charmap=ISO-8859-1) (ignored: LC_ALL set to en_US)

Versions of packages openssh-client depends on:
ii  adduser                      3.67.2      Add and remove users and groups
ii  debconf [debconf-2.0]        1.4.58      Debian configuration management sy
ii  dpkg                         1.13.11.0.1 package maintenance system for Deb
ii  libc6                        2.3.5-6     GNU C Library: Shared libraries an
ii  libcomerr2                   1.38-2      common error description library
pn  libedit2                     <none>      (no description available)
ii  libkrb53                     1.3.6-5     MIT Kerberos runtime libraries
ii  libncurses5                  5.4-9       Shared libraries for terminal hand
ii  libselinux1                  1.26-1      SELinux shared libraries
pn  libssl0.9.8                  <none>      (no description available)
ii  zlib1g                       1:1.2.3-4   compression library - runtime

openssh-client recommends no packages.

-- no debconf information