Update copyright info for ubuntuiso

This commit is contained in:
Matt Zimmerman 2008-10-03 14:54:11 +01:00
parent 7c092046ee
commit eb9d692c70
2 changed files with 10 additions and 9 deletions

13
debian/copyright vendored
View File

@ -14,6 +14,7 @@ Upstream Authors:
Kees Cook <kees@ubuntu.com> Kees Cook <kees@ubuntu.com>
Luke Yelavich <themuso@ubuntu.com> Luke Yelavich <themuso@ubuntu.com>
Martin Pitt <martin.pitt@ubuntu.com> Martin Pitt <martin.pitt@ubuntu.com>
Matt Zimmerman <mdz@ubuntu.com>
Michael Bienia <geser@ubuntu.com> Michael Bienia <geser@ubuntu.com>
Pete Savage <petesavage@ubuntu.com> Pete Savage <petesavage@ubuntu.com>
Siegfried-A. Gevatter <rainct@ubuntu.com> Siegfried-A. Gevatter <rainct@ubuntu.com>
@ -40,8 +41,8 @@ Copyright:
Licenses: Licenses:
404main, check-symbols, dgetlp, pbuilder-dist, requestsync, 404main, check-symbols, dgetlp, pbuilder-dist, requestsync,
reverse-build-depends, submittodebian and update-maintainer are licensed reverse-build-depends, submittodebian, ubuntuiso and update-maintainer are
under the GNU General Public License, version 2: licensed under the GNU General Public License, version 2:
This package is free software; you can redistribute it and/or modify This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -52,8 +53,8 @@ under the GNU General Public License, version 2:
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
On Debian systems, the complete text of the GNU General Public License v2 On Debian and Ubuntu systems, the complete text of the GNU General Public
can be found in `/usr/share/common-licenses/GPL-2'. License v2 can be found in `/usr/share/common-licenses/GPL-2'.
dch-repeat, get-branches, get-build-deps, massfile, mk-sbuild-lv, ppaput, dch-repeat, get-branches, get-build-deps, massfile, mk-sbuild-lv, ppaput,
pull-debian-debdiff, pull-lp-source, suspicious-source and what-patch are pull-debian-debdiff, pull-lp-source, suspicious-source and what-patch are
@ -68,8 +69,8 @@ licensed under the GNU General Public License, version 3:
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
On Debian systems, the complete text of the GNU General Public License v3 On Debian and Ubuntu systems, the complete text of the GNU General Public
can be found in `/usr/share/common-licenses/GPL-3'. License v3 can be found in `/usr/share/common-licenses/GPL-3'.
The following of the scripts can be used, at your option, regarding any The following of the scripts can be used, at your option, regarding any
later version of the previously specified license: 404main, dch-repeat, dgetlp, later version of the previously specified license: 404main, dch-repeat, dgetlp,

View File

@ -8,15 +8,15 @@
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation, version 2
# of the License, or (at your option) any later version. # of the License.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# See file /usr/share/common-licenses/GPL for more details. # See file /usr/share/common-licenses/GPL-2 for more details.
# #
# ################################################################## # ##################################################################