summaryrefslogtreecommitdiff
path: root/scripts/dpkg-distaddfile.pl
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2012-01-31 12:58:03 +0100
committerGuillem Jover <guillem@debian.org>2012-02-01 06:30:30 +0100
commit33f45255ee45479a39c9e913223ddbb17d602aa9 (patch)
tree7692e5e3f14a349b87888bd1f7b0826a0377d71a /scripts/dpkg-distaddfile.pl
parent9971d255b38c2dc0da40a3ec9c7cf4b1631366f8 (diff)
downloaddpkg-33f45255ee45479a39c9e913223ddbb17d602aa9.tar.gz
Move copyright information from --version output to file comment headers
Having to keep this information twice is error-prone as it easily gets out of sync. Having to translate it is bothersome. It's not consistent across dpkg tools, some do print it some don't. It's currently not accurate, as the output would need to include the holders for all files that end up being part of the binary. And listing it in the --versions output is visually annoying and the wrong place. Just keep this where it belongs, at the file comment headers, above the license information.
Diffstat (limited to 'scripts/dpkg-distaddfile.pl')
-rwxr-xr-xscripts/dpkg-distaddfile.pl5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/dpkg-distaddfile.pl b/scripts/dpkg-distaddfile.pl
index 7b5274e73..45f5d2680 100755
--- a/scripts/dpkg-distaddfile.pl
+++ b/scripts/dpkg-distaddfile.pl
@@ -2,6 +2,8 @@
#
# dpkg-distaddfile
#
+# Copyright © 1996 Ian Jackson
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -34,9 +36,6 @@ sub version {
printf _g("Debian %s version %s.\n"), $progname, $version;
printf _g("
-Copyright (C) 1996 Ian Jackson.");
-
- printf _g("
This is free software; see the GNU General Public License version 2 or
later for copying conditions. There is NO warranty.
");