X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=xfonts-traditional.git;a=blobdiff_plain;f=debian%2Fcopyright;h=71a2a5a8d416359dc99a72d8df826066d08e5fbe;hp=ff0bc3548b752bb3f8242db9198fd55966b133de;hb=b478cbc44440e2102fa1c4bab9e47f4f1e8be273;hpb=0ad0e0f8638d002f9585bc1d6ca5517ae2b0da25

diff --git a/debian/copyright b/debian/copyright
index ff0bc35..71a2a5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,6 +24,8 @@ xfonts-base.  For "good", version 3.3.6-2 and for "bad" 1:1.0.1.
 
 bad/10x20.pcf.gz came from xfonts-base 1:1.0.4+nmu1.
 
+bad/neep-alt-iso8859-1-06x13.pcf.gz is from xfonts-jmk 3.0-20.
+
 Most pcfs were originally generated from source code in that
 xfonts-base; but here, in xfonts-traditional, we do not modify them
 any longer.  (It would be possible to build-depend on the relevant
@@ -37,7 +39,11 @@ xfonts-base 3.3.6-2.  Mark Wooding created the `good' version of this font by
 hand-editing the `bad' version.  The edited version, like the original, is in
 the public domain.
 
-The copyright files for the two xfonts-base packages follow.
+good/neep-alt-iso8859-1-06x13.sfd was modified from the corresponding
+bad/*.pcf.gz by Ian Jackson using fontforge and is under the same
+licence as the .pcf.gz.
+
+The copyright files for the font packages follow.
 
 ======================================================================
 ======================================================================
@@ -548,3 +554,64 @@ font-sun-misc/COPYING:
     DEALINGS IN THE SOFTWARE.
 
 vim:set ai et sw=4 ts=4 tw=80:
+
+======================================================================
+======================================================================
+[ xfonts-jmk 3.0-20 copyright information: ]
+
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://www.jmknoble.net/fonts/
+Upstream-Contact: Jim Knoble <jmknoble@pobox.com>
+Upstream-Name: Jim's Fonts for X
+
+Files: *
+Copyright: 1998 Jim Knoble <jmknoble@pobox.com>
+License: GPL-2+
+Comment: Several additional patches and other contributions, including the
+ ISO-10646-1 10x20 Neep font, were provided by Derek Upham.  Derek Upham
+ has placed his modifications in the public domain.
+ .
+ The glyphs for the ISO-10646-1 10x20 Neep font were taken from the
+ misc-fixed font maintained by Marcus Kuhn.  Those glyphs have the
+ following copyright notice:
+ .
+ Public domain font.  Share and enjoy.
+ .
+ Since these changes are all compatible with the base package license of
+ GPL v2 or later, it's easiest to think of the entire contents of the
+ package as covered by that license.
+
+Files: debian/*
+Copyright: 1999, 2001 Joseph Carter <knghtbrd@debian.org>
+  2004-2008, 2010, 2013 Russ Allbery <rra@debian.org>
+License: GPL-2+
+Comment: Changes by Joseph Carter did not have explicit copyright or
+ license statements.  Presumbly those changes may be redistributed under
+ the same terms as the fonts in this package.
+ .
+ All changes and Debian packaging files by Russ Allbery are hereby placed
+ in the public domain.  If this is not possible in your jurisdiction,
+ please consider this a license to treat these files in all respects as if
+ they were in the public domain.
+
+License: GPL-2+
+ I have chosen to release them under the terms of the GNU General Public
+ License (GPL) version 2.0, or, at your option, any later version.  This
+ means that you may freely modify and distribute these fonts, as long as
+ you distribute the source code for the fonts as well.
+ .
+ Some few parts of these fonts are derived from the 6x13 fixed font
+ accompanying the XFree86-3.3.2 distribution of the X Window System.  That
+ font bears the notice "Public domain font; share and enjoy".
+ .
+ The vast majority of this set of fonts is original work.  Besides the
+ derivations noted above, any resemblance to other fonts, copyrighted or
+ not, may be accounted for by standard letter shapes and the relatively
+ coarse resolution (75dpi) for which the fonts were created.
+ .
+ No warranty of any kind, either express or implied, including that of
+ merchantibility or fitness for a particular purpose.  If anything breaks,
+ you get to keep both pieces.  Your mileage may vary.  Eat your
+ vegetables.
+Comment: You can find the GPL version 2 in /usr/share/common-licenses/GPL-2
+ on Debian systems.