aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorMikko Rantalainen <mikko.rantalainen@peda.net>2010-05-06 09:39:46 +0300
committerMikko Rantalainen <mikko.rantalainen@peda.net>2010-05-06 11:30:22 +0300
commit7f531c2cb5a27f055208ca4ce746254a7ba3479e (patch)
treede5f4724971b07801e23a0230f2bd45217b4cf10 /debian
parentb970f5fff2deb2563d35eb285f3f96ad06863e4e (diff)
downloadetherpad-7f531c2cb5a27f055208ca4ce746254a7ba3479e.tar.gz
etherpad-7f531c2cb5a27f055208ca4ce746254a7ba3479e.tar.xz
etherpad-7f531c2cb5a27f055208ca4ce746254a7ba3479e.zip
Fixed debian/copyright
The copyright file contained placeholders that I filled in. In addition, the copyright file contained wrong license (BSD) instead of the Apache License 2.0 claimed in the source files.
Diffstat (limited to 'debian')
-rw-r--r--debian/copyright54
1 files changed, 32 insertions, 22 deletions
diff --git a/debian/copyright b/debian/copyright
index 21f3788..0ddd16e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,42 +1,52 @@
This package was debianized by Egil Möller <egil.moller@piratpartiet.se> on
-Mon, 26 Apr 2010 19:51:51 +0200.
+Mon, 26 Apr 2010 19:51:51 +0200 and further fixed by Mikko Rantalainen.
-It was downloaded from <url://example.com>
+It was downloaded from http://github.com/mikkorantalainen/pad
Upstream Author(s):
- <put author's name and email here>
- <likewise for another author>
+ Aaron Iba <aaroniba@gmail.com>
+ Chris Ball <cjb@laptop.org>
+ Dan Bentley <dtbentley@gmail.com>
+ David Greenspan <davidgreenspan@gmail.com>
+ Egil Moeller <egil.moller@freecode.no>
+ Elliot Kroo <elliot@kroo.net>
+ Jeff Mitchell <etherpad@jefferai.org>
+ Jeppe Toustrup <jeppe@tenzer.dk>
+ Michael Prasuhn <mike@mikeyp.net>
+ Mikko Rantalainen <mikko.rantalainen@peda.net>
+ penSec.IT UG (haftungsbeschränkt) <etherpad@pensec.it>
+ Per Andersson <avtobiff@gmail.com>
+ Peter Martischka <pita@googlemail.com>
+ Unknown <root@primarypad.com>
+ Simon Bohlin <simon.bohlin@gmail.com>
+ Simon B @piratpartiet <simonb@redhog.org>
Copyright:
- <Copyright (C) YYYY Name OfAuthor>
- <likewise for another author>
+ Copyright (C) 2007-2009 Google Inc.
+ Copyright (C) 2009-2010 upstream authors, see above
License:
Redistribution and use in source and binary forms, with or without
modification, are permitted under the terms of the BSD License.
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
-On Debian systems, the complete text of the BSD License can be
-found in `/usr/share/common-licenses/BSD'.
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+On Debian systems, the complete text of the Apache 2.0 License can be
+found in `/usr/share/common-licenses/Apache-2.0'.
The Debian packaging is copyright 2010, Egil Möller <egil.moller@piratpartiet.se> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-# Please also look if there are files or directories which have a
-# different copyright/license attached and list them here.