Merge packages.

[pgp-tools.git] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index 623d451ea7a4d6050c3ddce7e4f3b80c179e1176..34d5157cbc822079b8c232b619b210dded67e04f 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,8 @@ 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) 2001-2005  Simon Richter <sjr@debian.org>
+  (c) 2005  Thijs Kinkhorst <kink@squirrelmail.org>
   Other contributors:
   Enrico Zini
   Benjamin Hill
@@ -40,3 +42,20 @@ 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.
 
+
+Licence for gpg-key2ps and gpg-mailkeys:
+
+  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
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  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