don't print version twice on --help

diff --git a/ChangeLog b/ChangeLog
index 140d49f608fd9f27b4bdbfc5b6d06765098a3318..64269cc27234b1cba95e29c05b4f14f8c50c64d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep 25 16:19:05 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * scripts/dpkg-divert.pl: don't print version twice on --help
+
 Thu Sep 21 16:29:32 CEST 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * debian/shlibs-default.template: removed

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index e7b78ebe16f0a20095c3efe16d670ff85edbe3f4..f176d8fb5f0228227cc94318f128f97ab92162be 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/scripts/dpkg-divert.pl
@@ -13,10 +13,9 @@ sub showversion {
 
 sub usage {
     &showversion;
-    print(STDERR <<END)
-"Debian dpkg-divert $version.
+    print STDERR <<EOF
 Copyright (C) 1995 Ian Jackson.
-Copyright (C) 2000 Wichert Akkerman
+Copyright (C) 2000 Wichert Akkerman.
 
 This is free software; see the GNU General Public Licence version 2 or later
 for copying conditions. There is NO warranty.
@@ -42,7 +41,7 @@ Options:
 When adding, default is --local and --divert <original>.distrib.
 When removing, --package or --local and --divert must match if specified.
 Package preinst/postrm scripts should always specify --package and --divert.
-END
+EOF
         || &quit("failed to write usage: $!");
 }