debian/copyright: update formatting (DEP5) and years of packaging

copyright.

diff --git a/debian/changelog b/debian/changelog
index 53ec31034b91d7c368345d7477777eccdff99233..32368abc937257fe572da7739281830e9aca9130 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ mimetic (0.9.6-2) UNRELEASED; urgency=low
   * Convert to source format 3.0 (quilt).
   * Set Standards-Version to 3.8.4 (no changes).
   * Use the autotools-dev debhelper addon.
+  * debian/copyright: update formatting (DEP5) and years of packaging
+    copyright.
 
  -- gregor herrmann <gregoa@debian.org>  Sat, 29 May 2010 15:31:05 +0200
 

diff --git a/debian/copyright b/debian/copyright
index fa88be2b90afecfde1c0b65333bd47085ae52c68..38ba42a9a3794d38b696ed267ec68b06e6294f12 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,35 +1,39 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Stefano Barbato <stefano@codesink.org>
-Upstream-Source: http://codesink.org/mimetic_mime_library.html
-Upstream-Name: mimetic
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Stefano Barbato <stefano@codesink.org>
+Source: http://codesink.org/mimetic_mime_library.html
+Name: mimetic
 
 Files: *
 Copyright: 2002-2009, Stefano Barbato <stefano@codesink.org>
 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.
+ 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.
 
 Files: debian/*
-Copyright:
- © 2005-2009 gregor herrmann <gregoa@debian.org>
- © 2006-2009 tony mancill <tmancill@debian.org>
+Copyright: 2005-2010, gregor herrmann <gregoa@debian.org>
+ 2006-2010, tony mancill <tmancill@debian.org>
 License: GPL-2+
 
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License version 2 can be found in `/usr/share/common-licenses/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
+ the Free Software Foundation; version 2 dated June, 1991, or (at your
+ option) any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of version 2 of the GNU
+ General Public License can be found in `/usr/share/common-licenses/GPL-2'