diff options
| author | Bdale Garbee <bdale@gag.com> | 2012-09-12 20:01:22 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2012-09-12 20:01:22 -0600 |
| commit | 3b612efcd1dddc6a3d59012f7ed57754b1f798c2 (patch) | |
| tree | 18d50713491ef96c5c127a309f870efb6c33f98d /debian/copyright | |
| parent | e076773c1693e2a62bb828dee71c04c20dbab0a5 (diff) | |
| parent | 01eb36408d7e0e826b431fcc1d3b2deb23607e0b (diff) | |
Merge branch 'new-debian' into debian
Conflicts:
ChangeLog
debian/altos.install
debian/changelog
debian/control
debian/copyright
debian/dirs
debian/docs
debian/menu
debian/rules
src/Makefile
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/debian/copyright b/debian/copyright index 7d9a469e..55841bca 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,8 +10,23 @@ Upstream Authors: Copyright: - Copyright © 2009 Keith Packard <keithp@keithp.com> + The overall AltOS package is + Copyright © 2009-2011 Keith Packard <keithp@keithp.com> + + Significant contributions include + + Copyright © 2009-2011 Bdale Garbee <bdale@gag.com> + Copyright © 2009-2011 Anthony Towns <aj@erisian.com.au> + + Some files incorporated from other projects carry other copyrights: + + Copyright © 2001, 2002, 2003 Jan Kiszka (Jan.Kiszka@web.de) + Copyright © 1991-1995 Paul J Turner, Portland, OR + Copyright © 1996-2000 Grace Development Team + Copyright © 1984, 1987, 1989, 1995 Stephen L. Moshier + Copyright © 2003 Maarten Brock, sourceforge.brock@dse.nl + License: This program is free software; you can redistribute it and/or modify @@ -29,7 +44,7 @@ License: The Debian packaging is: - Copyright (C) 2009 Bdale Garbee <bdale@gag.com> + Copyright © 2009-2011 Bdale Garbee <bdale@gag.com> and is also licensed under the GPL version 2. |