[DRE-commits] [rails] 02/08: Keep the guides/ (CC-BY-SA-3.0) and mona_lisa.jpg (PD), but document that in d/copyright

[Ondrej Sury]

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

ondrej pushed a commit to branch master
in repository rails.

commit 34cc5de41d22cb94aa2dee9c4892800294e3adf1
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jul 16 17:19:03 2014 +0200

    Keep the guides/ (CC-BY-SA-3.0) and mona_lisa.jpg (PD), but document that in d/copyright
---
 debian/copyright | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 47cf1ba..77d2444 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,10 @@ Files: *
 Copyright: Copyright 2004-2013 David Heinemeier Hansson
 License: Expat
 
+Files: guides/*
+Copyright: Copyright 2004-2013 David Heinemeier Hansson
+License: CC-BY-3.0
+
 Files: guides/assets/javascripts/syntaxhighlighter/*.js
        guides/assets/stylesheets/syntaxhighlighter/*.css
 Copyright: 2004-2010 Alex Gorbatchev
@@ -17,7 +21,11 @@ Files: actionpack/test/controller/selector_test.rb
        actionpack/lib/action_view/vendor/html-scanner/html/selector.rb
        actionpack/lib/action_dispatch/testing/assertions/selector.rb
 Copyright: 2006 Assaf Arkin (http://labnotes.org)
-License: Expat or CC-BY
+License: Expat or CC-BY-3.0
+
+Files: actionpack/test/fixtures/multipart/mona_lisa.jpg
+Copyright: Musée du Louvre
+License: Public Domain
 
 Files: debian/*
 Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
@@ -65,7 +73,7 @@ License: GPL
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-License: CC-BY
+License: CC-BY-3.0
  THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS
  OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE
  WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE

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