X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;ds=sidebyside;f=debian%2Fcopyright;h=d153a4705f137ce0bfefe25352b74f16d3b32399;hb=dead413fb7663a89ab36ba0b172e849ee75ab5d3;hp=43649874b469595c675d2d0d20a685c2b1842287;hpb=d985efe62c2ec4c9b1a8c8b56da84fb775e6c48c;p=filters.git

diff --git a/debian/copyright b/debian/copyright
index 4364987..d153a47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,26 +1,23 @@
-This is the filters package.
-
-This package was put together by Joey Hess <joeyh@debian.org>, using
-sources from all over, and rewriting from scratch certian filters that did
-not have a free (or any) license.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: Gathered from many sources, including old usenet posts in the 90's.
 
 Files: *
-Copyright: 1996-2009 Joey Hess <joey@kitenet.net>
+Copyright: 1996-2009 Joey Hess <id@joeyh.name>
 License: GPL-2+
  The full text of the GPL is distributed as GPL in filters's source,
  and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
 
 Files: jethro.l
 Copyright: 1993 Duane Paulson <ci922@cleveland.freenet.edu>
-License: other
+License: other-1
   **   Public domain. Use at your own risk. Y'all come back now, heah?
 
-Files: kraut.dir/*
+Files: kraut.l
 Copyright: 1989 John Sparks
-License: other
+License: other-2
   /* This is in the public domain. Do with it as you will. *\
 
-Files: cockney.l, jive.l, nyc.l
+Files: cockney.l jive.l nyc.l
 Copyright: 1986 Daniel V Klein <dvk@lonewolf.com>
 License: GPL
  Daniel confirmed the copyright in this email:
@@ -41,11 +38,11 @@ License: GPL
 
 Files: rasterman
 Copyright: 1997 Zachary Beane
-License: GPL
+License: GPL-2
 
 Files: ken.l
 Copyright: Stephen K Mulrine <smulrine%cs.strath.ac.uk@nsfnet-relay.ac.uk>
-License: other
+License: other-3
  The ken filter is now in the public domain. Its author confirmed the
  new license in this email:
  .
@@ -65,7 +62,8 @@ License: other
 
 Files: ky00te.dir/*
 Copyright: 1994 Brent E. Edwards
-License: GPL
+License: GPL-2
+Comment:
  The ky00te filter is now relicensed under the GPL. Its author
  confirmed the new license in this email:
  .
@@ -82,7 +80,7 @@ License: GPL
 
 Files: newspeak.l
 Copyright: 1991 Jamie Zawinski <jwz@jwz.org>
-License: other
+License: other-4
  The newspeak filter is now relicensed under a BSD-like copyright. Its
  author established the new copyright in this email:
  .
@@ -109,17 +107,17 @@ License: other
 
 Files: studly
 Copyright: Nick Phillips <nwp@lemon-computing.com>
-License: other
+License: other-5
  # just for reference, you may do whatever you like with this file.
 
-Files: nethackify
+Files: nethackify.c
 Copyright: 2004 G�kan Seng� <gurkan@linuks.mine.nu>
-License: GPL
+License: GPL-2
 
 Files: pirate
 Copyright: 2003 Dougal Campbell
-License: GPL
- Converted from a php version in the funfilters.
+License: GPL-2
+Comment: Converted from a php version in the funfilters.
 
 Files: kenny
 Copyright:
@@ -134,3 +132,7 @@ Copyright: 2007 Adam Borowski <kilobyte@angband.pl>
 License: GPL-3+
  The full text of the GPL version 3 can be found in 
  /usr/share/common-licenses/GPL-3 on Debian systems.
+
+License: GPL-2
+ The full text of the GPL is distributed as GPL in filters's source,
+ and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.