[DRE-commits] [SCM] ruby-json.git branch, master, updated. upstream/1.5.3-26-g7a1050f

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 7a1050f5ece44b89cddcf8ac351e9c085994e6a1
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Sep 25 11:31:47 2011 +0200

    Relicense debian changes as GPLv2 to match upstream.

diff --git a/debian/changelog b/debian/changelog
index 29d9bd2..8c85247 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ruby-json (1.6.1-1) unstable; urgency=low
   * New upstream release.
   * executables have been moved to a separate gem.
     + drop edit-json package.
+  * Relicense debian changes as GPLv2 to match upstream.
 
  -- Lucas Nussbaum <lucas at debian.org>  Sun, 25 Sep 2011 11:24:54 +0200
 
diff --git a/debian/copyright b/debian/copyright
index f77c642..ea327d5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,8 @@ Source: https://rubygems.org/gems/json
 Files: *
 Copyright: Copyright 2005-2007 by Florian Frank <flori at ping.de>
 License: GPL-2
+
+License: GPL-2
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License Version 2 as published
  by the Free Software Foundation.
@@ -24,4 +26,4 @@ License: GPL-2
 
 Files: debian/*
 Copyright: Copyright 2011 Lucas Nussbaum <lucas at lucas-nussbaum.net>
-License: GPL-2+
+License: GPL-2

-- 
ruby-json.git