[DHG_packages] 03/04: gitit: update and refactor `debian/copyright'

[Dmitry Bogatov]

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

kaction-guest pushed a commit to branch master
in repository DHG_packages.

commit 8e40f97dfbca1459aa208866fde230ceb7e1bf0e
Author: Dmitry Bogatov <KAction at gnu.org>
Date:   Mon Jan 18 07:55:22 2016 +0300

    gitit: update and refactor `debian/copyright'
---
 p/gitit/debian/changelog |  1 +
 p/gitit/debian/copyright | 82 +++++++++++++++++++++++++++---------------------
 2 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/p/gitit/debian/changelog b/p/gitit/debian/changelog
index 24f74f2..8fd2f65 100644
--- a/p/gitit/debian/changelog
+++ b/p/gitit/debian/changelog
@@ -4,6 +4,7 @@ gitit (0.12.0.1-1) UNRELEASED; urgency=medium
   * Relax dependency on aeson.
   * Relax dependency on hoauth2 (houth2-0.5 in LTS-4.0)
   * Install forgotten `data/post-update' hook
+  * Update and refactor `debian/copyright'
 
  -- Dmitry Bogatov <KAction at gnu.org>  Sat, 09 Jan 2016 22:09:53 +0300
 
diff --git a/p/gitit/debian/copyright b/p/gitit/debian/copyright
index 0d503ce..59c713f 100644
--- a/p/gitit/debian/copyright
+++ b/p/gitit/debian/copyright
@@ -5,16 +5,57 @@ Source: http://hackage.haskell.org/package/gitit
 Files-Excluded: */jquery*.js
 
 Files: *
-Copyright: © 2008-2009, John MacFarlane <jgm at berkeley.edu>
-           © 2009, Gwern Branwen <gwern0 at gmail.com>
-           © 2009, Henry Laxen <nadine.and.henry at pobox.com>
-           © 2009, Anton van Straaten <anton at appsolutions.com>
+Copyright: 2008-2009, John MacFarlane <jgm at berkeley.edu>
+           2009, Gwern Branwen <gwern0 at gmail.com>
+           2009, Henry Laxen <nadine.and.henry at pobox.com>
+           2009, Anton van Straaten <anton at appsolutions.com>
 License: GPL-2+
+
+Files: src/Network/Gitit/Rpxnow.hs
+Copyright: 2008, Michael Snoyman <michael at snoyman.com>
+License: BSD-2-clause
+
+Files: plugins/Interwiki.hs
+       plugins/WebArchiver.hs
+Copyright: written by Gwern Brawnen and put into the public domain
+License: public-domain
+ The author declared that these files are "put in the public domain".
+
+Files: plugins/ImgTex.hs
+Copyright: Kohei OZAKI <i at smly.org>
+           John MacFarlane <jgm at berkeley.edu>
+License: GPL-2+
+
+Files: data/static/css/reset-fonts-grids.css
+Copyright: 2009, Yahoo! Inc.
+License: BSD-3-clause
+
+Files: data/static/js/MathMLinHTML.js
+Copyright: 2004, Peter Jipsen
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2010 - 2011, Giovanni Mascellani <gio at debian.org>
+           2016,        Dmitry Bogatov <KAction at gnu.org>
+License: GPL-3+
+ The Debian packaging information is under the GPL, version 3 or later.  On
+ Debian GNU/Linux systems, the complete text of the GNU General Public License
+ Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+
+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 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.
+ .
  On Debian systems, the text of the GPL-2 license can be found in the
  file `/usr/share/common-licenses/GPL-2'.
 
-Files: Network/Gitit/Rpxnow.hs
-Copyright: © 2008, Michael Snoyman <michael at snoyman.com>
 License: BSD-2-clause
  All rights reserved.
  .
@@ -38,23 +79,7 @@ License: BSD-2-clause
  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-X-Origin: http://hackage.haskell.org/package/authenticate
-
-Files: plugins/Interwiki.hs
-       plugins/WebArchiver.hs
-Copyright: written by Gwern Brawnen and put into the public domain
-License: public-domain
- The author declared that these files are "put in the public domain".
-
-Files: plugins/ImgTex.hs
-Copyright: © Kohei OZAKI <i at smly.org>
-           © John MacFarlane <jgm at berkeley.edu>
-License: GPL-2+
- On Debian systems, the text of the GPL-2 license can be found in the
- file `/usr/share/common-licenses/GPL-2'.
 
-Files: data/static/css/reset-fonts-grids.css
-Copyright: © 2009, Yahoo! Inc.
 License: BSD-3-clause
  Redistribution and use of this software in source and binary forms,
  with or without modification, are permitted provided that the following
@@ -82,16 +107,3 @@ License: BSD-3-clause
  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: data/static/js/MathMLinHTML.js
-Copyright: © 2004, Peter Jipsen
-License: GPL-2+
- On Debian systems, the text of the GPL-2 license can be found in the
- file `/usr/share/common-licenses/GPL-2'.
-
-Files: debian/*
-Copyright: © 2010 - 2011, Giovanni Mascellani <gio at debian.org>
-License: GPL-3+
- The Debian packaging information is under the GPL, version 3 or later.  On
- Debian GNU/Linux systems, the complete text of the GNU General Public License
- Version 3 can be found in `/usr/share/common-licenses/GPL-3'.

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