[gdal] 07/12: Update copyright file, add license & copyright for JPNG_band.cpp.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental-2.1
in repository gdal.

commit ea5f8f63feef28f7a6439339b69ae4d5fd705a4f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Apr 18 19:50:17 2016 +0200

    Update copyright file, add license & copyright for JPNG_band.cpp.
---
 debian/changelog |  1 +
 debian/copyright | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 32cd069..e37404a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gdal (2.1.0~rc1+dfsg-1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.8, no changes.
   * Update watch file for 2.1.0 pre-releases.
   * New upstream release candidate.
+  * Update copyright file, add license & copyright for JPNG_band.cpp.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 18 Apr 2016 19:33:05 +0200
 
diff --git a/debian/copyright b/debian/copyright
index a6edc78..57ae103 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -348,6 +348,10 @@ Files: frmts/jpipkak/jpipkakdataset.cpp
 Copyright: 2000-2007, ITT Visual Information Solutions
 License: ITT
 
+Files: frmts/mrf/JPNG_band.cpp
+Copyright: 2016, Esri
+License: Apache-2.0
+
 Files: frmts/mrsid_lidar/gdal_MG4Lidar.cpp
 Copyright: 2010, LizardTech
 License: BSD-3-Clause
@@ -689,6 +693,22 @@ License: fsf-unlimited-disclaimer
  even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  PARTICULAR PURPOSE.
 
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License can be found
+ in `/usr/share/common-licenses/Apache-2.0'.
+
 License: Artistic
  This program is free software; you can redistribute it and/or modify
  it under the terms of the Artistic License, which comes with Perl.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git