diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-09 17:12:53 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-09 17:12:53 -0700 |
| commit | 573e21e410934f2293d5ac4c738af5f77083b43b (patch) | |
| tree | 006a2586447b7f2e9353556f74633db605436777 /debian/copyright | |
| parent | 0de1ad17c333d645774ac3b48d652ccd4ecd6900 (diff) | |
| parent | 7a6f9e972def00f7f0435d9f2616bcb79dc619b7 (diff) | |
| download | initramfs-tools-573e21e410934f2293d5ac4c738af5f77083b43b.tar.gz initramfs-tools-573e21e410934f2293d5ac4c738af5f77083b43b.zip | |
Merge branch 'upstream' (0.98.2) into mendocino
Conflicts:
debian/changelog
debian/compat
debian/control
debian/rules
hook-functions
mkinitramfs
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/debian/copyright b/debian/copyright index b473ab4..9fe89c8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ http://git.debian.org/?p=kernel/initramfs-tools.git;a=shortlog Authors: Adam Conrad <adconrad@ubuntu.com>, Ben Collins <bcollins@ubuntu.com>, David Härdeman <david@hardeman.nu>, - Jeff Bailey <jbailey@ubuntu.com>, + Jeff Bailey <jbailey@ubuntu.com>, maximilian attems <maks@debian.org>, Scott James Remnant <scott@ubuntu.com> @@ -21,9 +21,12 @@ Copyright: 2005 - 2006 Adam Conrad 2006 Ben Collins 2005 - 2007 David Härdeman 2005 Jeff Bailey - 2005 - 2007 maximilian attems + 2005 - 2009 maximilian attems 2005 - 2006 Scott James Remnant License: -PUBLIC DOMAIN +GPL v2 or any later version + +On Debian systems, the complete text of the GNU General Public License version +2 can be found in `/usr/share/common-licenses/GPL-2'. |