+ Make also-encrypt-to a list, add a commented stanza to the default

[pgp-tools.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 4fb205cf40f57edf9300d51dddc3088507f45f50..b1418be0b5e20f525b9363e8057e74b9891cd7e3 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,11 +8,12 @@ Availability:
     svn://svn.debian.org/pgp-tools/trunk/
 
 Authors and Copyright:
     svn://svn.debian.org/pgp-tools/trunk/
 
 Authors and Copyright:

-  (c) 2004, 2005 Peter Palfrader <peter@palfrader.org>
-  (c) 2004 Uli Martens <uli@youam.net>
-  (c) 2004, 2005 Christoph Berg <cb@df7cb.de>
+  (c) 2000, 2002, 2004, 2005  Peter Palfrader <peter@palfrader.org>
+  (c) 2004  Uli Martens <uli@youam.net>
+  (c) 2004, 2005, 2006  Christoph Berg <cb@df7cb.de>

   (c) 2001-2005  Simon Richter <sjr@debian.org>
   (c) 2005  Thijs Kinkhorst <kink@squirrelmail.org>
   (c) 2001-2005  Simon Richter <sjr@debian.org>
   (c) 2005  Thijs Kinkhorst <kink@squirrelmail.org>

+  (c) 2000, 2002  Christian Kurz <shorty@debian.org>

   Other contributors:
   Enrico Zini
   Benjamin Hill
   Other contributors:
   Enrico Zini
   Benjamin Hill


@@ -42,7 +43,7 @@ License for caff and gpgsigs:
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 

-Licence for gpg-key2ps and gpg-mailkeys:
+Licence for gpg-key2ps, gpg-mailkeys, and keylookup:

   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
   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


@@ -55,5 +56,5 @@ Licence for gpg-key2ps and gpg-mailkeys:
 
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;
 
   You should have received a copy of the GNU General Public License with
   the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL;

-  if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-  Suite 330, Boston, MA  02111-1307  USA
+  if not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+  Fifth Floor, Boston, MA  02110-1301, USA