[DRE-commits] [SCM] ruby-aruba.git branch, master, updated. upstream/0.5.1-13-gf508bac

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit f9899dc4f03fa25dd5446c12b01b0fa70baebbf0
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu May 9 23:31:43 2013 +0530

    update license of templates/images/*

diff --git a/debian/copyright b/debian/copyright
index 74fe55c..c66b0a0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,32 @@ Files: *
 Copyright: 2010-2012 Aslak Hellesøy <aslak.hellesoy at gmail.com>
                      David Chelimsky <https://github.com/dchelimsky>
                      Mike Sassak <msassak at gmail.com>
-License: MIT
+License: Expat
+
+Files: templates/images/*
+Copyright: Mark James <http://www.famfamfam.com/lab/icons/silk/>
+License: CC-BY
+ I also love to hear of my work being used, feel encouraged to send an email
+ with a link or screenshot of the icons in their new home to mjames at gmail
+ dot com. This work is licensed under a Creative Commons Attribution 2.5
+ License. This means you may use it for any purpose, and make any changes you
+ like. All I ask is that you include a link back to this page in your credits
+ (although a giant link on every page of your website really isn't needed,
+ contact me to discuss specifics).
+ .
+ The icons can also be used under Creative Commons Attribution 3.0 License
+ (Hi Debian folks!) with the following requirements:
+ .
+  As an author, I would appreciate a reference to my authorship of the Silk
+  icon set contents within a readme file or equivalent documentation for the
+  software which includes the set or a subset of the icons contained within.
+
+Files: debian/*
+Copyright: 2012 Hideki Yamane <henrich at debian.org>
+					 2013 Praveen Arimbrathodiyil <praveen at debian.org>
+License: 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
@@ -26,8 +51,6 @@ License: MIT
  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: 2012 Hideki Yamane <henrich at debian.org>
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public

-- 
ruby-aruba.git