[openid4java] 04/04: Update copyright information

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository openid4java.

commit 2c21dec29479c8abe8e16a15ac2814a671e74ee1
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Fri Aug 11 18:45:21 2017 +0100

    Update copyright information
---
 debian/changelog |  3 ++-
 debian/copyright | 55 +++++++++++++++++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 029f171..bdb7ab2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ openid4java (0.9.6.662-4) UNRELEASED; urgency=medium
   * Remove myself from uploaders list. (Closes: #XXXXXX)
   * Bump DH compat level to 10.
   * Wrap and sort dependencies lists.
+  * Update copyright info.
 
- -- Miguel Landaeta <nomadium at debian.org>  Wed, 09 Aug 2017 21:13:39 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Wed, 09 Aug 2017 21:14:32 +0100
 
 openid4java (0.9.6.662-3) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index e7a5907..8cfdeeb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: openid4java
 Source: https://github.com/jbufu/openid4java
 Files-Excluded: *.jar
@@ -12,14 +12,7 @@ Files-Excluded: *.jar
 
 Files: *
 Copyright: 2006-2009 Sxip Identity Corporation
-License: Apache-2
- 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
- .
- On Debian systems, the full text of the Apache
- License version 2 can be found in the file
- `/usr/share/common-licenses/Apache-2.0'.
+License: Apache-2.0
 
 Files: samples/appengine-consumer/src/main/java/org/openid4java/appengine/AppEngineGuiceModule.java
   samples/appengine-consumer/src/main/java/org/openid4java/appengine/AppEngineHttpFetcher.java
@@ -30,26 +23,44 @@ Files: samples/appengine-consumer/src/main/java/org/openid4java/appengine/AppEng
   src/org/openid4java/util/HttpFetcher.java
   test/src/org/openid4java/consumer/InjectionTest.java
 Copyright: 2009 Google Inc.
-License: Apache-2
- 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
- .
- On Debian systems, the full text of the Apache
- License version 2 can be found in the file
- `/usr/share/common-licenses/Apache-2.0'.
+License: Apache-2.0
 
 Files: debian/*
 Copyright: 2010 Olivier Weinstoerffer <olivier.weinstoerffer at gmail.com>
            2010 Xavier Oswald <xoswald at debian.org>
            2011 Miguel Landaeta <nomadium at debian.org>
 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 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  .
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
+
+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 full text of the Apache
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/Apache-2.0'.

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