[DRE-commits] [SCM] rails-2.3.git branch, debian-sid, updated. 0288d3496b551d2b35d0233f10713cb4d65bf2d6

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 5a8e99839fc673b68677e31d387e31527ede6e58
Author: Ondřej Surý <ondrej at sury.org>
Date:   Thu Jun 9 10:28:08 2011 +0200

    Update upstream copyright (sorry goes to ftp-masters)

diff --git a/debian/copyright b/debian/copyright
index b7144ea..87f2f4c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,30 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
 Upstream-Name: rails
-Source: FIXME (URL where source can be downloaded)
+Upstream-Contact: David Heinemeier Hansson <david at loudthinking.com>
+Source: http://rubygems.org/gems/rails
 
 Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
-License: GPL-2+
- 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.
+Copyright: Copyright 2004 David Heinemeier Hansson
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
  .
- 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.
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
  .
- 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
- .
- 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'.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]
+Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
+License: Expat

-- 
rails-2.3.git