[SCM] pd-iemmatrix/master: Fixed comments/license-grants in debian/copyright

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7f28fe1f5fb284690dbcdf344ee918463e2573ca
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Thu May 21 10:05:08 2015 +0200

    Fixed comments/license-grants in debian/copyright

diff --git a/debian/copyright b/debian/copyright
index f354d63..b65f28c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,13 +12,25 @@ License: GPL-2+
 Files: src/mtx_spherical_harmonics/*
 Copyright: 2007-2008 Franz Zotter <zotter at iem.at>
 License: GPL-3
+License-Grant:
  This code is published under the Gnu General Public License, see
  "LICENSE.txt"
+Comment:
+ No file "LICENSE.txt" exists in that same directory (and even if being a
+ subdirectory to the general project, autotools files clearly indicate this
+ being a subproject), but a file "LICENSE" exists that contains the full
+ contents of the GNU General Public License (GPL) version 3.
 
 Files: src/mtx_spherical_harmonics/cmdline/*
 Copyright: 2009 Franz Zotter <zotter at iem.at>
 License: GPL-3
+License-Grant:
  see ../LICENSE.txt
+Comment:
+ No file "LICENSE.txt" exists in the parent directory (and even if being a
+ subdirectory to the general project, autotools files clearly indicate this
+ being a subproject), but a file "LICENSE" exists that contains the full
+ contents of the GNU General Public License (GPL) version 3.
 
 Files: src/mtx_spherical_harmonics/Makefile.in
  src/mtx_spherical_harmonics/cmdline/Makefile.in
@@ -45,10 +57,6 @@ License: GPL-2+ with Autoconf exception
 Files: src/mtx_spherical_harmonics/install-sh
 Copyright: 1994, X Consortium
 License: Expat with X exception
- Except as contained in this notice, the name of the X Consortium shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from the X Consortium.
 
 Files: src/mtx_spherical_harmonics/configure
 Copyright: 1992-1996,1998-2006, Free Software Foundation, Inc
@@ -98,12 +106,13 @@ License: GPL-2+
  WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  General Public License for more details.
-Comment:
- On Debian systems, the complete text of the GNU General Public License
- (GPL) version 2 can be found in '/usr/share/common-licenses/GPL-2'.
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+Comment:
+ On Debian systems, the complete text of the GNU General Public License
+ (GPL) version 2 can be found in '/usr/share/common-licenses/GPL-2'.
 
 License: GPL-3
  This program is free software: you can redistribute it and/or modify
@@ -118,16 +127,10 @@ License: GPL-3
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
 Comment:
- No file "LICENSE.txt" exist in that same directory (and even if being a
- subdirectory to the general project, autotools files clearly indicate
- this being a subproject), but the file "LICENSE" exist which contains
- the full contents of the GNU Public License (GPL) version 3.
  On Debian systems, the complete text of the GNU General Public License
  (GPL) version 3 can be found in '/usr/share/common-licenses/GPL-3'.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: Expat with X exception
  Permission is hereby granted, free of charge, to any person obtaining a
@@ -148,3 +151,8 @@ License: Expat with X exception
  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.
+ .
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the X Consortium.

-- 
pd-iemmatrix packaging