From ec1689f1364895809f761ffb21ec6af7e9a445f8 Mon Sep 17 00:00:00 2001 From: myon Date: Sun, 30 Apr 2006 09:13:03 +0000 Subject: [PATCH] + Bump copyright, use URL in User-Agent header. git-svn-id: svn://svn.debian.org/pgp-tools/trunk@274 b513b33f-fedd-0310-b452-c3deb5f4c849 --- caff/caff | 6 +++--- debian/changelog | 3 ++- debian/copyright | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/caff/caff b/caff/caff index 9712932..8c6e7e6 100755 --- a/caff/caff +++ b/caff/caff @@ -4,7 +4,7 @@ # $Id$ # # Copyright (c) 2004, 2005 Peter Palfrader -# Copyright (c) 2005 Christoph Berg +# Copyright (c) 2005, 2006 Christoph Berg # # All rights reserved. # @@ -635,7 +635,7 @@ my $KEYEDIT_KEYEDIT_OR_DELSIG_PROMPT = '^\[GNUPG:\] (GET_BOOL keyedit.delsig|GET my $KEYEDIT_DELSUBKEY_PROMPT = '^\[GNUPG:\] GET_BOOL keyedit.remove.subkey'; load_config; -my $USER_AGENT = "caff $VERSION - (c) 2004, 2005 Peter Palfrader et al."; +my $USER_AGENT = "caff $VERSION - http://pgp-tools.alioth.debian.org/"; my $KEYSBASE = $CONFIG{'caffhome'}.'/keys'; my $GNUPGHOME = $CONFIG{'caffhome'}.'/gnupghome'; @@ -650,7 +650,7 @@ my $DATE_STRING = sprintf("%04d-%02d-%02d", $year+1900, $mon+1, $mday); sub version($) { my ($fd) = @_; - print $fd "caff $VERSION - (c) 2004, 2005 Peter Palfrader et al.\n"; + print $fd "caff $VERSION - (c) 2004, 2005, 2006 Peter Palfrader et al.\n"; }; sub usage($$) { diff --git a/debian/changelog b/debian/changelog index 02ce1ab..3c71402 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,9 @@ signing-party (0.4.6-1) unreleased; urgency=low * caff: + Try hostname without -f first to be compatible with BSD (Closes: #356830). + + Bump copyright, use URL in User-Agent header. - -- Christoph Berg Sun, 30 Apr 2006 10:52:10 +0200 + -- Christoph Berg Sun, 30 Apr 2006 11:10:53 +0200 signing-party (0.4.5-1) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 5403267..b1418be 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,12 +8,12 @@ Availability: svn://svn.debian.org/pgp-tools/trunk/ Authors and Copyright: - (c) 2000, 2002, 2004, 2005 Peter Palfrader - (c) 2004 Uli Martens - (c) 2004, 2005 Christoph Berg + (c) 2000, 2002, 2004, 2005 Peter Palfrader + (c) 2004 Uli Martens + (c) 2004, 2005, 2006 Christoph Berg (c) 2001-2005 Simon Richter (c) 2005 Thijs Kinkhorst - (c) 2000, 2002 Christian Kurz , + (c) 2000, 2002 Christian Kurz Other contributors: Enrico Zini Benjamin Hill -- 2.30.2