[Pkg-haskell-commits] [SCM] Debian package for MissingH branch, master, updated. debian/1.1.0.3-1-12-g2f7c227

Sun Jul 4 21:11:04 UTC 2010

The following commit has been merged in the master branch:
commit 2f7c227f3ca6e89f83aef91a1b10f49bfe9b0d5b
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jul 4 22:59:03 2010 +0200

    debian/copyright updated and fixed to make lintian happy

diff --git a/debian/changelog b/debian/changelog
index 6274c46..b81ca9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ missingh (1.1.0.3-3) unstable; urgency=low
   * Fixed some lintian warnings:
     - First person phrasing in description removed
     - Added debian/watch
+  * debian/copyright updated and fixed to make lintian happy
 
  -- Iain Lane <laney at ubuntu.com>  Sat, 03 Jul 2010 16:49:49 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 11ebbb5..2f12ea8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -126,7 +126,7 @@ Copyright/License for all Wash modules:
   POSSIBILITY OF SUCH DAMAGE. 
 
 ----------------------------------------------------
-Portions if System.Path come from Volker Wysk's HsShellScript
+Portions of System.Path come from Volker Wysk's HsShellScript
 library, version 2.1.0.  That code is Copyright (c) 2004 Volker Wysk
 and is licensed under the GNU LGPL 2.1
 
@@ -150,9 +150,8 @@ Data.Compression.Inflate is
 Copyright 2004 Ian Lynagh <igloo at earth.li>
 Licence: 3 clause BSD.
 
-Debian GNU/Linux users may find the 3-clause BSD license at
-/usr/share/common-licenses/BSD.  Alternatively, you may find it at
-3rd-party-licenses/BSD.  Please note that the University of California
+The text of the 3 clause BSD is available below in this file.
+Please note that the University of California
 has no claim on this code; simply substitute Ian Lynagh for the
 University wherever it may occur in that file.
 
@@ -164,9 +163,8 @@ Data.Hash.MD5* is
 Copyright 2001 Ian Lynagh <igloo at earth.li>
 Licence: GPL or 3 clause BSD
 
-Debian GNU/Linux users may find the 3-clause BSD license at
-/usr/share/common-licenses/BSD.  Alternatively, you may find it at
-3rd-party-licenses/BSD.  Please note that the University of California
+The text of the 3 clause BSD is available below in this file.
+Please note that the University of California
 has no claim on this code; simply substitute Ian Lynagh for the
 University wherever it may occur in that file.
 
@@ -174,7 +172,7 @@ The code was obtained from
 http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/md5/
 
 ----------------------------------------------------
-System.Time.Utils.ParseDate is from 
+System.Time.ParseDate is from 
 http://www.dtek.chalmers.se/~d00bring/projects.html
 
 Copyright (c) Björn Bringert
@@ -183,32 +181,34 @@ License: GNU General Public License, version 2
 I (John Goerzen) have modified only the module name and Haddock
 comments at the top of it.
 
-----------------------------------------------------
-MissingH.Regex.Pesco was written by Sven Moritz Hallberg,
-<pesco@@gmx.de>, on December 6, 2004.  It was pulled from the darcs
-repository at http://www.scannedinavian.org/~pesco/code/Regex/ as of
-January 28, 2005.  The pescofmt.fmt in the doc/ directory was also
-written by him.  The Pesco.pdf in the doc/ directory is generated from
-these two files.
-
-Sven's license is:
-
-TO THOSE CONCERNED ABOUT THE LAW:
-
-         All of this is mine! Take it and your soul shall be damned forever.
-         But you can keep it and do with it whatever you want.
-           -- SMH, Creator, Programmer.
-
-----------------------------------------------------
-System.Path.FilePath was written by Isaac Jones.  It was pulled from
-the darcs repository at
-http://www.scannedinavian.org/~lemmih/FilePath/ as of July 21, 2005.
-
-The software is Copyright Isaac Jones 2003-2005.  All rights reserved.
-
-Debian GNU/Linux users may find the 3-clause BSD license at
-/usr/share/common-licenses/BSD.  Alternatively, you may find it at
-3rd-party-licenses/BSD.  Please note that the University of California
-has no claim on this code; simply substitute Isaac Jones for the
-University wherever it may occur in that file.
+=====================================================================
+3 clause BSD license text
+=====================================================================
+
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. 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.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY 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.
 

-- 
Debian package for MissingH

