[SCM] gsequencer/master: merged copyright

[jkraehemann-guest at users.alioth.debian.org]

Moved Files:debian/* to the bottom of the Files-section
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ff7f8a27a82265f6d3c21e4a774ef5d44b4c5500
X-Git-Newrev: 25eb40fd4348f8c00f0e7d48a8457963f7df991b

The following commit has been merged in the master branch:
commit 25eb40fd4348f8c00f0e7d48a8457963f7df991b
Merge: 73db448b470c6ba55a40478b22a6bf3688106b20 ff7f8a27a82265f6d3c21e4a774ef5d44b4c5500
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Wed Jun 24 22:34:42 2015 +0200

    merged copyright

diff --combined debian/copyright
index 616a621,48be995..fea5a85
--- a/debian/copyright
+++ b/debian/copyright
@@@ -6,14 -6,6 +6,14 @@@ Files: 
  Copyright: 2005-2015 Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
  License: GPL-3+
  
 +Files: src/*
 +Copyright: 2005-2015 Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
 +License: GPL-3+
 +
 +Files: src/ags/lib/ags_parameter.c
 +Copyright: 1995 Spencer Kimball and Peter Mattis
 +License: GPL-2+
 +
  Files: AUTHORS ChangeLog COPYING INSTALL NEWS README gsequencer.1 gsequencer-documentation midi2xml.1 missing doc/*
  Copyright: 2005-2015 Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
  License: GFDL-1.3+
@@@ -22,25 -14,14 +22,29 @@@ Files: gsequencer-share/
  Copyright: 2005-2015 Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
  License: GPL-3+
  
+ Files: src/*
+ Copyright: 2005-2015 Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
+ License: GPL-3+
+ 
  Files: debian/*
  Copyright: 2005-2015 Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
  License: GPL-3+
  
 +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 as published by
 + the Free Software Foundation; either version 2 of the License, or
 + (at your option) any later version.
 + .
 + This program is distributed in the hope that it will be useful,
 + but 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.
 + .
 + You should have received a copy of the GNU General Public License
 + along with this program; if not, write to the Free Software
 + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 +
  License: GPL-3+
   This package is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

-- 
gsequencer packaging