[httpunit] 04/04: Update copyright information

Mon Aug 7 10:07:39 UTC 2017

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

nomadium pushed a commit to branch master
in repository httpunit.

commit 9d387b388053c9523b6717695b154302e974bf46
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Mon Aug 7 11:07:20 2017 +0100

    Update copyright information
---
 debian/changelog |  3 ++-
 debian/copyright | 69 +++++++++++++++++++++++---------------------------------
 2 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b704646..26b6c4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ httpunit (1.7+dfsg-13) UNRELEASED; urgency=medium
   * Remove myself from uploaders list. (Closes: #XXXXXX)
   * Bump DH compat level to 10.
   * Wrap and sort dependencies list.
+  * Update copyright info.
 
- -- Miguel Landaeta <nomadium at debian.org>  Mon, 07 Aug 2017 11:06:31 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Mon, 07 Aug 2017 11:07:05 +0100
 
 httpunit (1.7+dfsg-12) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index c818d87..2a51838 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,53 +1,21 @@
-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: httpunit
 Upstream-Contact: Russell Gold <russgold at httpunit.org>
 Source: http://httpunit.org/
 
 Files: *
-Copyright: © 2000-2008, Russell Gold <russgold at httpunit.org>
-License: other
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE. 
+Copyright: 2000-2008, Russell Gold <russgold at httpunit.org>
+License: Expat
 
 Files: examples/GoogleMapsExample.java
-Copyright: © 2008, Wolfgang Fahl, BITPlan GmbH (http://www.bitplan.com)
-License: other
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE. 
+Copyright: 2008, Wolfgang Fahl, BITPlan GmbH (http://www.bitplan.com)
+License: Expat
 
 Files: debian/*
-Copyright: © 2009-2013, Miguel Landaeta <miguel at miguel.cc>,
- © 2010, Gabriele Giacone <1o5g4r8o at gmail.com>
+Copyright: 2009-2013, Miguel Landaeta <nomadium at debian.org>
+           2010, Gabriele Giacone <1o5g4r8o at gmail.com>
+License: GPL-2+
+
 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
@@ -65,3 +33,22 @@ License: GPL-2+
  .
  On Debian systems the full text of the GNU General Public License can be
  found in the `/usr/share/common-licenses/GPL-2' file.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.

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

