From 7bbde7d4da3f2ddc5834bc98fa38a971997821f6 Mon Sep 17 00:00:00 2001 From: Vivek K J <vivekkj@protonmail.com> Date: Sun, 28 Mar 2021 09:08:48 +0000 Subject: [PATCH] Update licence with upstream (Closes: #985033) --- debian/changelog | 6 ++++++ debian/copyright | 18 +++++------------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index cd2ab38..db55f6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +coderay (1.1.3-4) unstable; urgency=medium + + * Update Licence with modified upstream licence (Closes: #985033) + + -- Vivek K J <vivekkj@protonmail.com> Sat, 27 Mar 2021 16:40:52 +0530 + coderay (1.1.3-3) unstable; urgency=medium [ Cédric Boutillier ] diff --git a/debian/copyright b/debian/copyright index 191664b..d95d50a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,12 @@ Source: http://coderay.rubychan.de/ Upstream-Contact: Kornelius Kalnbach <murphy@rubychan.de> Files: * -Copyright: 2009, Kornelius Kalnbach <murphy@rubychan.de> -License: LGPL-2.1 +Copyright: 2005, Kornelius Kalnbach <murphy@rubychan.de> +License: Expat Files: debian/* Copyright: + 2021 Vivek K J <vivekkj@protonmail.com> 2011 Jérémy Lal <kapouer@melix.org> 2010 Deepak Tripathi <apenguinlinux@gmail.com> 2009 Opscode, Inc <legal@opscode.com> @@ -18,11 +19,7 @@ Files: lib/coderay/encoders/terminal.rb Copyright: 2009 Rob Aldred (http://robaldred.co.uk) 2009 Nathan Weizenbaum (http://nex-3.com) -License: MIT - -Files: lib/coderay/scanners/sql.rb -Copyright: 2009 Josh Goebel -License: LGPL-2.1 +License: Expat Files: lib/coderay/scanners/yaml.rb Copyright: 2004 Jamis Buck <jgb3@email.byu.edu> @@ -32,11 +29,7 @@ License: GPL-3 On Debian systems, full text of the GPL-3 license can be found in `/usr/share/common-licenses/GPL-3' -License: LGPL-2.1 - On Debian systems, full text of the LGPL-2.1 license can be found - in `/usr/share/common-licenses/LGPL-2.1' - -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 @@ -54,7 +47,6 @@ License: MIT 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. License: BSD-3-clause Redistribution and use in source and binary forms, with or without -- GitLab