[Pkg-haskell-commits] darcs: ghc: Tweak debian/copyright

[Joachim Breitner]

Mon Feb 14 15:40:52 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Tweak debian/copyright 
  Ignore-this: 96c4f13bc03e2e8917b7b66d238dab26

    M ./changelog +1
    M ./copyright -34

Mon Feb 14 15:40:52 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Tweak debian/copyright 
  Ignore-this: 96c4f13bc03e2e8917b7b66d238dab26
diff -rN -u old-ghc/changelog new-ghc/changelog
--- old-ghc/changelog	2011-02-14 15:47:25.771938328 +0000
+++ new-ghc/changelog	2011-02-14 15:47:25.803940002 +0000
@@ -1,6 +1,7 @@
 ghc (7.0.1-2) UNRELEASED; urgency=low
 
   * (Closes: 554174) Segfaults at startup not observable any more
+  * Tweak debian/copyright 
 
  -- Joachim Breitner <nomeata at debian.org>  Mon, 31 Jan 2011 18:25:56 +0530
 
diff -rN -u old-ghc/copyright new-ghc/copyright
--- old-ghc/copyright	2011-02-14 15:47:25.771938328 +0000
+++ new-ghc/copyright	2011-02-14 15:47:25.795939583 +0000
@@ -129,37 +129,3 @@
 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.
-
-
-GHC includes utf8-string
-Copyright:	Galois Inc, 2007
-		Iavor S. Diatchki, 2009
-		Eric Mertens, 2009
-* 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 Galois Inc. 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 Galois Inc. ``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 Galois Inc. 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.
-
-distrib/windows-installer-licences.txt states that the components of
-this bundle are distributed under various licenses, including 3 clause
-BSD (as above), The Artistic License (see
-/usr/share/common-licenses/Artistic), GNU GPL v2 (see
-/usr/share/common-licenses/GPL-2) and GNU LGPL v3 (see
-/usr/share/common-licenses/LGPL-3)