[pkg-fgfs-crew] [flightgear-data] 01/01: Update debian/copyright, also skip the c172p's WebPanel.

[Markus Wanner]

This is an automated email from the git hooks/post-receive script.

markus_wanner-guest pushed a commit to tag debian/2016.2.1+dfsg-1
in repository flightgear-data.

commit 9f5ff9770f255f632c34efbddb4c472195de3cd2
Author: Markus Wanner <markus at bluegap.ch>
Date:   Sat Jun 4 08:55:43 2016 +0200

    Update debian/copyright, also skip the c172p's WebPanel.
---
 debian/changelog |  6 ++++--
 debian/copyright | 53 +++--------------------------------------------------
 2 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f727c68..e1e7acc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-flightgear-data (1:2016.2.1+dfsg-2) UNRELEASED; urgency=medium
+flightgear-data (1:2016.2.1+dfsg-1) unstable; urgency=medium
 
   [ Rebecca N. Palmer ]
   * New upstream release: 2016.1.1.
@@ -16,11 +16,13 @@ flightgear-data (1:2016.2.1+dfsg-2) UNRELEASED; urgency=medium
   * New upstream release; 2016.2.1.
   * Remove Phi from this source package, bundle separately, allows
     getting rid of the JavaScript dependencies and all missing-sources
+    for this package.
   * Update watch file to track the sourceforge site.
   * Update get-orig-source to use mkorigtgz.
   * Bump S-V: no changes required.
+  * Update debian/copyright.
 
- -- Markus Wanner <markus at bluegap.ch>  Mon, 30 May 2016 15:28:33 +0200
+ -- Markus Wanner <markus at bluegap.ch>  Sat, 04 Jun 2016 08:54:27 +0200
 
 flightgear-data (3.4.0+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 01b35fd..d70c77f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,30 +3,22 @@ Upstream-Name: flightgear-data
 Upstream-Contact: Curtis L. Olson <curt at flightgear.org>
 Source: http://www.flightgear.org
 Files-Excluded:
+ Aircraft/c172p/WebPanel
  Fonts/LiberationFonts
  Phi
  Timezone
 
 Files: *
 Copyright: 1999-2012 Curtis L. Olson <curt at flightgear.org>
- and the the FlightGear team (see the Thanks file).
+ and the FlightGear team (see the Thanks file).
 License: GPL-2+
 
-Files: Aircraft/Cub/*
-Copyright: 1999-2012 Curtis L. Olson <curt at flightgear.org>
- and the the FlightGear team (see the Thanks file).
-License: GPL-3+
-
 Files: debian/*
 Copyright: 2001-2012 Ove Kaaven <ovek at arcticnet.no>
            2013 Scott Howard <showard at debian.org>
-           2013 Markus Wanner <markus at bluegap.ch>
+           2013-2016 Markus Wanner <markus at bluegap.ch>
 License: GPL-2+
 
-Files: debian/missing-sources/sprintf.js-1.0.2/*
-Copyright: 2007-2013, Alexandru Marasteanu <hello [at) alexei (dot] ro>
-License: BSD-3-clause
-
 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
@@ -40,42 +32,3 @@ License: GPL-2+
  .
  A copy of the license is available on Debian systems at
  /usr/share/common-licenses/GPL-2
-
-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.
- .
- A copy of the license is available on Debian systems at
- /usr/share/common-licenses/GPL-3
-
-License: BSD-3-clause
- All rights reserved.
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear-data.git