[DRE-commits] [SCM] ruby-railties-3.2.git branch, master, updated. debian/3.2.3-1-3-g1b60900

[Ondřej Surý]

The following commit has been merged in the master branch:
commit f0f1e622d0a8df1171c8dd75a05f07c9f047c220
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 23 13:40:58 2012 +0200

    Update copyright to match all nested code (SyntaxHighlighter and Icons from DocBook XSL project)

diff --git a/debian/copyright b/debian/copyright
index 316fa81..9220947 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,45 @@ Source: http://rubygems.org/gems/railties
 Files: *
 Copyright: Copyright 2004 David Heinemeier Hansson
 License: Expat
+
+Files: guides/assets/javascripts/syntaxhighlighter/*.js guides/assets/stylesheets/syntaxhighlighter/*.css
+License: GPL or Expat
+
+Files: guides/assets/images/icons/*
+Copyright: 1999-2007, Norman Walsh
+           2003, Jiří Kosek
+           2004-2007, Steve Ball
+	   2005-2008, The DocBook Project
+	   2011-2012, O'Reilly Media
+License: Expat
+
+Files: debian/*
+Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
+License: Expat
+
+License: GPL
+ 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.
+ .
+ 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 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'.
+
+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
@@ -24,7 +63,3 @@ License: Expat
  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 2011 Ondřej Surý <ondrej at debian.org>
-License: Expat

-- 
ruby-railties-3.2.git