[SCM] Debian packaging for jack-audio-connection-kit branch, master.jackd2, updated. debian/1.9.4+svn3842-2-68-g8fcb012

[js at users.alioth.debian.org]

The following commit has been merged in the master.jackd2 branch:
commit 5f7287effc7bcdba990eb9c454311b3c56e1d119
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Apr 3 19:40:07 2010 +0200

    Revert to document GPL-3+ licensed RTF file in coypright file.
    
    This reverts commit 34228a8f8e847d5aa7996b58527fe4155ce324a2.

diff --git a/debian/copyright b/debian/copyright
index df1fa84..45dd7c1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,9 +13,6 @@ Reason: unneeded and possibly sourceless binaries
 Excluded-Files: ./windows/**.rc
 Reason: unneeded sources, copyright-protected without licence
 
-Excluded-Files: ./windows/Setup/src/gpl_installer.rtf
-Reason: incompatible licensed as GPL-3+
-
 Copyright: 2004-2009, Grame <grame at grame.fr>
 License: LGPL-2.1+
 
@@ -398,6 +395,11 @@ Copyright: 2001, Paul Davis
 	2004-2008, Grame <grame at grame.fr>
 License: other-GPL-2-or
 
+Files: ./windows/Setup/src/gpl_installer.rtf
+Copyright: 2001, Paul Davis
+	2004-2008, Grame <grame at grame.fr>
+License: GPL-3+
+
 Files: ./common/jack/control.h
 Copyright: 2008, Grame <grame at grame.fr>
 	2008, Nedko Arnaudov
@@ -628,6 +630,24 @@ License: other-GPL-2-or
  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: GPL-3+
+ 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 3 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.
+ .
+ On Debian GNU systems, the complete text of the GNU General Public
+ License (GPL) version 3 or newer can be found in
+ '/usr/share/common-licenses/GPL'.
+ .
+ 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: other-SA-jack
  This file is distributed under the same license as the
  jack-audio-connection-kit package.

-- 
Debian packaging for jack-audio-connection-kit