[DRE-commits] [SCM] rails-2.3.git branch, master, updated. debian/2.3.14-2-6-ga8340a4

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 82d0c03a1a5c1461338c055328c1837f8cdd6108
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 29 19:57:09 2012 +0200

    Fixed copyright to fit the Debian copyright format version 1.0

diff --git a/debian/changelog b/debian/changelog
index 729ab80..afac39a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ ruby-rails-2.3 (2.3.14-3) UNRELEASED; urgency=low
     - Bumped standards-version to 3.9.3.
     - Bumped build-dependency on gem2deb to >= 0.3.0~.
     - Changed conflicts into breaks.
+  * debian/copyright: fixed to to fit the Debian copyright format version 1.0.
 
  -- Paul van Tilburg <paulvt at debian.org>  Fri, 29 Jun 2012 19:55:28 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 9652612..021df89 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rails
 Upstream-Contact: David Heinemeier Hansson <david at loudthinking.com>
 Source: http://rubygems.org/gems/rails
@@ -6,28 +6,10 @@ Source: http://rubygems.org/gems/rails
 Files: *
 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:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- 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: lib/rails_generator.rb
 Copyright: (c) 2004 Jeremy Kemper
-License: Expat (see above)
+License: Expat
 
 Files: html/javascript/controls.js
        html/javascript/dragdrop.js
@@ -35,11 +17,11 @@ Files: html/javascript/controls.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)
+License: Expat
 
 Files: html/javascript/prototype.js
 Copyright: 2005-2010 Sam Stephenson
-License: Expat (see above)
+License: Expat
 
 Files: debian/*
 Copyright: 2011 Ondřej Surý <ondrej at debian.org>
@@ -59,4 +41,24 @@ License: GPL-3+
  .
 
  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
+ version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
+
+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:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ 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.
\ No newline at end of file

-- 
rails-2.3.git