[DHG_packages] 01/05: haskell-blaze-html: convert `debian/copyright' to dep5 format

Dmitry Bogatov kaction-guest at moszumanska.debian.org
Thu May 19 19:37:30 UTC 2016


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 ff816ee78f602e189d39b588caaa99125b4f3529
Author: Dmitry Bogatov <KAction at gnu.org>
Date:   Thu May 19 11:38:21 2016 +0300

    haskell-blaze-html: convert `debian/copyright' to dep5 format
---
 p/haskell-blaze-html/debian/changelog |  1 +
 p/haskell-blaze-html/debian/copyright | 46 +++++++++++++++++++++++++----------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/p/haskell-blaze-html/debian/changelog b/p/haskell-blaze-html/debian/changelog
index 4529cc9..87648e5 100644
--- a/p/haskell-blaze-html/debian/changelog
+++ b/p/haskell-blaze-html/debian/changelog
@@ -2,6 +2,7 @@ haskell-blaze-html (0.8.1.1-2) UNRELEASED; urgency=medium
 
   * Use secure (https) uri in Vcs-Git field in 'debian/control'
   * Bump standards version to 3.9.8 (no changes needed)
+  * Convert `debian/copyright' to dep5 format
 
  -- Dmitry Bogatov <KAction at gnu.org>  Tue, 10 May 2016 09:34:50 +0300
 
diff --git a/p/haskell-blaze-html/debian/copyright b/p/haskell-blaze-html/debian/copyright
index 76371fe..5cc104e 100644
--- a/p/haskell-blaze-html/debian/copyright
+++ b/p/haskell-blaze-html/debian/copyright
@@ -1,13 +1,40 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: blaze-html
-Upstream-Contact: Jasper Van der Jeugt <jaspervdj at gmail.com>
-Source: http://hackage.haskell.org/package/blaze-html
+Upstream-Contact: Jasper Van der Jeugt <m at jaspervdj.be>
+Source: https://hackage.haskell.org/package/blaze-html
 
 Files: *
-Copyright: © 2010, Jasper Van der Jeugt <jaspervdj at gmail.com>
-License: BSD
- All rights reserved.
+Copyright: 2010 Jasper Van der Jeugt
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: held by the contributors mentioned in debian/changelog
+      2011 Giovanni Mascellani <gio at debian.org>
+License: GPL-3+
+Comment: part of debianization is copyrighted by Giovanni as GPL-3+,
+ so we have a bit awkward situation. Rare case, when I would prefer
+ BSD over GPL. Giovani is emailed.
+ .
+ -- Dmitry Bogatov
+
+License: GPL-3+
+ 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 3
+ 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.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian system, copy of GNU Lesser General Public License version 3
+ is also located at `/usr/share/common-licenses/GPL-3'
+
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
@@ -34,10 +61,3 @@ License: BSD
  THEORY OF 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: debian/*
-Copyright: © 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



More information about the Pkg-haskell-commits mailing list