[DRE-commits] [SCM] rails-2.3.git branch, debian-sid, updated. debian/2.3.11-1-2-g7c569da

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 1f92bcb9663885310d60d9761b6ea26e5fda80c2
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 14 10:37:30 2011 +0200

    Update copyright to include all authors and all embedded libraries (later removed), Debian packaging copyright relicensed to GPL-3+

diff --git a/debian/copyright b/debian/copyright
index 87f2f4c..9652612 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: David Heinemeier Hansson <david at loudthinking.com>
 Source: http://rubygems.org/gems/rails
 
 Files: *
-Copyright: Copyright 2004 David Heinemeier Hansson
+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
@@ -25,6 +25,38 @@ License: Expat
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+Files: lib/rails_generator.rb
+Copyright: (c) 2004 Jeremy Kemper
+License: Expat (see above)
+
+Files: html/javascript/controls.js
+       html/javascript/dragdrop.js
+       html/javascript/effects.js
+Copyright: 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+           2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+           2005-2008 Jon Tirsen (http://www.tirsen.com)
+License: Expat (see above)
+
+Files: html/javascript/prototype.js
+Copyright: 2005-2010 Sam Stephenson
+License: Expat (see above)
+
 Files: debian/*
-Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
-License: Expat
+Copyright: 2011 Ondřej Surý <ondrej at debian.org>
+License: GPL-3+
+ 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 3 of the License, or
+ (at your option) any later version.
+ .
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
\ No newline at end of file

-- 
rails-2.3.git