From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 16 Aug 2017 01:54:57 +0000 (+0100)
Subject: debian/copyright, .mailmap: Convert to machine-readable format.
X-Git-Tag: 1.1.0~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib-python/commitdiff_plain/1f050a1e1499e0d4fcc3d16480806cd3f9b83fa2

debian/copyright, .mailmap: Convert to machine-readable format.
---

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..c635e4a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Mark Wooding <mdw@distorted.org.uk> <mdw>
+Mark Wooding <mdw@distorted.org.uk> <mdw@metalzone.distorted.org.uk>
diff --git a/debian/copyright b/debian/copyright
index 5c1a437..775e274 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,29 @@
-mLib-python is copyright (c) 2003 Straylight/Edgeware.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Copyright: 2005--2010, 2013, 2017 Straylight/Edgeware
+Upstream-Name: mLib-python
+Upstream-Contact: Mark Wooding <mdw@distorted.org.uk>
+Source: https://ftp.distorted.org.uk/pub/mdw/
+License: GPL-2.0+
 
-mLib-python 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.
+Files: *
+Copyright: 2005--2010, 2013, 2017 Straylight/Edgeware
+License: GPL-2.0+
 
-mLib-python 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 a copy of the GNU General Public License in
-/usr/share/common-licenses/GPL; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.
+License: GPL-2.0+
+ mLib-python 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.
+ .
+ mLib-python 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 a copy of the GNU General Public License in
+ /usr/share/common-licenses/GPL; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ 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/LGPL-2'.