[sikuli] 45/53: Update debian/copyright

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository sikuli.

commit 87864b48252ba8e99cf424cc9aab20aa77e5aefe
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Jun 2 23:23:06 2014 +0200

    Update debian/copyright
    
    Acknowledge Jygments code inclusion.
---
 debian/README.source |  1 -
 debian/changelog     |  2 ++
 debian/copyright     | 38 +++++++++++++++++++++++++++++++-------
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index e08cc52..fcb6038 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -3,7 +3,6 @@ TO-DO
 
 * Update source package name to sikulix
 * Check Tesseract usage
-* copyright jygment (threecrickets.com)
 * sikuli2html : use /usr/bin/python as shebang
 
 UPDATING UPSTREAM SOURCE TREE
diff --git a/debian/changelog b/debian/changelog
index 84af9fe..a38891f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ sikuli (1.1.0~beta1-1) UNRELEASED; urgency=medium
   * New all in one upstream GitHub project (see d/README.source)
   * Project name officially changed from Sikuli to SikuliX
     Changing package's name accordingly (to do)
+  * Updated d/copyright:
+    Jygments4SikuliX/src includes code from the Jygments project
 
  -- Gilles Filippini <pini at debian.org>  Mon, 05 May 2014 19:40:40 +0200
 
diff --git a/debian/copyright b/debian/copyright
index dfdb28a..0f3b3c5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,13 +13,7 @@ Source: gathered from five upstream github repositories:
 Files: *
 Copyright: 2009-2012 Massachusetts Institute of Technology
            2011-2013 Raimund Hocke <rmhdevelop at me.com>
-License: MIT
-
-Files: debian/*
-Copyright: 2010-2013 Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-License: GPL-3+
-
-License: MIT
+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
@@ -38,6 +32,36 @@ License: MIT
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
+Files: Jygments4SikuliX/src/*
+Copyright: 2010-2014 Three Crickets LLC: http://threecrickets.com/
+           2013-2014 Raimund Hocke <rmhdevelop at me.com>
+License: Jygment-MIT-variant
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ .
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Comment: Based on the works at [Jygments](http://code.google.com/p/jygments/)
+
+Files: debian/*
+Copyright: 2010-2013 Debian Java maintainers <pkg-java-maintainers at lists.alioth.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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git