[DRE-commits] [diaspora] 03/05: update copyright file

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora.

commit 0be0a21acbf8e4545eb3dfe6b6e9c7c4e75e675e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat May 2 14:47:30 2015 +0530

    update copyright file
---
 debian/copyright | 54 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index b622a53..f2f8da1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,43 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: diaspora
-Source: FIXME <http://example.com/>
+Source: http://github.com/diaspora/diaspora
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2010 Daniel Grippi
+	   2010 Ilya Zhitomirskiy
+	   2010 Maxwell Salzberg
+	   2010 Raphael Sofaer
+License: AGPL-3+ with OpenSSL exception
 
 Files: debian/*
 Copyright: 2014 Pirate Praveen <praveen at debian.org>
-License: GPL-2+ (FIXME)
+License: AGPL-3+ with OpenSSL exception
 Comment: the Debian packaging is licensed under the same terms as the original package.
 
-License: GPL-2+ (FIXME)
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+License: AGPL-3+ with OpenSSL exception
+ Diaspora is copyright Diaspora Inc., 2010, and files herein are licensed
+ under the Affero General Public License version 3, the text of which can
+ be found in GNU-AGPL-3.0, or any later version of the AGPL, unless otherwise
+ noted.  Components of Diaspora, including Rails, JQuery, and Devise, are
+ licensed under the MIT/X11 license.  Blueprint-CSS is licensed under a
+ modified version of the MIT/X11 license.  All unmodified files from these
+ and other sources retain their original copyright and license notices: see
+ the relevant individual files.  Attribution information for Diaspora is
+ contained in the AUTHORS file.
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations
+ including the two.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You must obey the GNU Affero General Public License V3 or later in all respects
+ for all of the code used other than OpenSSL or the components mentioned
+ above.  If you modify file(s) with this exception, you may extend this
+ exception to your version of the file(s), but you are not obligated to
+ do so.  If you do not wish to do so, delete this exception statement from your
+ version.  If you delete this exception statement from all source files in the
+ program, then also delete it here.
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ You can find the full text of the GNU Affero General Public License
+ version 3 can be found in the file /usr/share/diaspora/GNU-AGPL-3.0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora.git