[DRE-commits] [SCM] ruby-rqrcode.git branch, master, updated. debian/0.3.3-2-4-gf99775c

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit eff1764fd635149107ec400cd926a21270a42de8
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Wed Dec 7 08:04:48 2011 -0600

    Homogeneize/fix the licensing information

diff --git a/debian/copyright b/debian/copyright
index f7b4914..ba55834 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,11 +5,11 @@ Source: http://whomwah.github.com/rqrcode/
 
 Files: *
 Copyright: Copyright (c) 2008 Duncan Robertson
-License: MIT
+License: MIT/X
 
 Files: debian/*
 Copyright: Copyright © 2008-2011 Gunnar Wolf <gwolf at debian.org>
-License: GPL-3+
+License: MIT/X
 
 License: MIT/X
  Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -28,14 +28,3 @@ License: MIT/X
  THE AUTHORS 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: GPL-3+
- The files hereby included are free software; you can distribute them
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 3 of the License, or (at
- your option) any later version.
- .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
-

-- 
ruby-rqrcode.git