summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-08-13 13:34:27 -0700
committerJohannes Schauer <josch@debian.org>2016-08-14 08:36:18 +0200
commit4aa3e51bdab2bad6e3fa9c9ec2d6f762c1a30ace (patch)
tree82a9364ca567a218b0b1a136fa9d04bbde350658
parente2186c006ff22499b4478c8ecc890e860b9630a4 (diff)
MIT -> Expat & factor out license paragraph
-rw-r--r--debian/changelog5
-rw-r--r--debian/copyright23
2 files changed, 8 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index deb6a89..c8f4eb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,10 @@ pdfrw (0.2-3) UNRELEASED; urgency=medium
This fixes co-installing python-pdfrw and python3-pdfrw, and other
package combinations.
Thanks to Aaron M. Ucko and Yuri D'Elia for useful information.
- * Add proper DEP-5 header to copyright file.
+ * d/copyright improvements:
+ - Add proper DEP-5 header
+ - Correct licence name MIT -> Expat
+ - Factor out Expat license text into its own paragraph
* Fix Vcs-* URIs.
They were previously pointing at the dgit repo for src:botch.
* Declare compliance with Policy 3.9.8 (no changes required).
diff --git a/debian/copyright b/debian/copyright
index 037bf09..ab4381c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,28 +4,13 @@ Source: https://github.com/pmaupin/pdfrw
Files: *
Copyright: © 2006-2009 Patrick Maupin
-License: MIT
- 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.
+License: Expat
Files: debian/*
Copyright: © 2011 Chris Lamb <chris@chris-lamb.co.uk>
-License: MIT
+License: Expat
+
+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