[DHG_packages] 11/22: haskell-edit-distance: convert `debian/copyright' to dep5 format

Dmitry Bogatov kaction-guest at moszumanska.debian.org
Fri May 20 10:28:33 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 566edce79ce8794faef35af84c48b889ce4a10b1
Author: Dmitry Bogatov <KAction at gnu.org>
Date:   Fri May 20 13:01:17 2016 +0300

    haskell-edit-distance: convert `debian/copyright' to dep5 format
---
 p/haskell-edit-distance/debian/changelog |  1 +
 p/haskell-edit-distance/debian/copyright | 54 +++++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/p/haskell-edit-distance/debian/changelog b/p/haskell-edit-distance/debian/changelog
index 4e03654..71483de 100644
--- a/p/haskell-edit-distance/debian/changelog
+++ b/p/haskell-edit-distance/debian/changelog
@@ -2,6 +2,7 @@ haskell-edit-distance (0.2.2.1-4) 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:35:13 +0300
 
diff --git a/p/haskell-edit-distance/debian/copyright b/p/haskell-edit-distance/debian/copyright
index abc2ca0..7534fee 100644
--- a/p/haskell-edit-distance/debian/copyright
+++ b/p/haskell-edit-distance/debian/copyright
@@ -1,23 +1,29 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: edit-distance
-Upstream-Contact: Maximilian Bolingbroke
-Source: http://hackage.haskell.org/package/edit-distance
+Upstream-Contact: Oleg Grenrus <oleg.grenrus at iki.fi>
+Source: https://hackage.haskell.org/package/edit-distance
 
 Files: *
-Copyright: 2008 Maximilian Bolingbroke
-License: BSD
- All rights reserved.
- .
+Copyright: 2008-2013 Maximilian Bolinbroke
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: held by the contributors mentioned in debian/changelog
+           2012 Joey Hess <joeyh at debian.org>
+License: GPL-3+
+Comment: Joey is emailed about relicensing.
+
+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:
  .
-    * Redistributions of source code must retain the above copyright notice, this list of
-      conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice, this list of
-      conditions and the following disclaimer in the documentation and/or other materials
-      provided with the distribution.
-    * Neither the name of Maximilian Bolingbroke nor the names of other contributors may be used to
-      endorse or promote products derived from this software without specific prior written permission.
+     * Redistributions of source code must retain the above copyright notice, this list of
+       conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice, this list of
+       conditions and the following disclaimer in the documentation and/or other materials
+       provided with the distribution.
+     * Neither the name of Maximilian Bolingbroke nor the names of other contributors may be used to
+       endorse or promote products derived from this software without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -28,9 +34,19 @@ License: BSD
  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: © 2012 Joey Hess <joeyh 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'.
+ 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'
\ No newline at end of file

-- 
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