[Pkg-haskell-commits] darcs: haskell-network: New upstream release

[KAction at gnu.org]

Mon Feb 23 11:33:01 UTC 2015  KAction at gnu.org
  * New upstream release
  
   * Modernize debian/copyright into machine-readable format
  
   * Modernize debian/control(use blurbs)

    M ./changelog -7 +12
    M ./control -16 +16
    M ./copyright -82 +35

Mon Feb 23 11:33:01 UTC 2015  KAction at gnu.org
  * New upstream release
  
   * Modernize debian/copyright into machine-readable format
  
   * Modernize debian/control(use blurbs)
diff -rN -u old-haskell-network/changelog new-haskell-network/changelog
--- old-haskell-network/changelog	2015-02-23 11:36:13.630130306 +0000
+++ new-haskell-network/changelog	2015-02-23 11:36:13.630130306 +0000
@@ -1,3 +1,9 @@
+haskell-network (2.6.0.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Dmitry Bogatov <KAction at gnu.org>  Mon, 23 Feb 2015 14:15:30 +0300
+
 haskell-network (2.4.1.2-3) experimental; urgency=medium
 
   * Depend on haskell-devscripts 0.9, found in experimental
@@ -73,8 +79,8 @@
   * Use ghc instead of ghc6
 
   [ Joachim Breitner ]
-  * New upstream release 
-  * Switch to using parsec 3 
+  * New upstream release
+  * Switch to using parsec 3
 
  -- Joachim Breitner <nomeata at debian.org>  Sun, 27 Mar 2011 10:16:17 +0530
 
@@ -99,7 +105,7 @@
 
   [ Joachim Breitner ]
   * Bump haskell-devscripts dependency to 0.7
-  * New upstream version. 
+  * New upstream version.
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 12 Feb 2010 15:34:22 +0100
 
@@ -117,9 +123,9 @@
 
 haskell-network (2.2.1.4-1) unstable; urgency=low
 
-  * New upstream release (Version as specified by the Haskell Platform) 
+  * New upstream release (Version as specified by the Haskell Platform)
   * Add watchfile
-  * Adopt for the Debian Haskell Group. Thanks to Kari for his previous work. 
+  * Adopt for the Debian Haskell Group. Thanks to Kari for his previous work.
   * Bump standards version
 
  -- Joachim Breitner <nomeata at debian.org>  Sun, 16 Aug 2009 19:29:29 +0200
@@ -223,7 +229,7 @@
   * Upgrade to "Generic Haskell cabal library debian/rules v0.6".
     Tell setup to use ghc6 rather than ghc, so that the postinst/prerm
     scripts work when the ghc-pkg symlink doesn't exist or doesn't
-    point to ghc6's ghc-pkg. 
+    point to ghc6's ghc-pkg.
 
  -- Ian Lynagh (wibble) <igloo at debian.org>  Mon, 20 Nov 2006 20:50:42 +0000
 
@@ -242,4 +248,3 @@
   * Initial release (was part of ghc6 until version 6.6-1).
 
  -- Ian Lynagh (wibble) <igloo at debian.org>  Fri, 13 Oct 2006 16:43:11 +0000
-
diff -rN -u old-haskell-network/control new-haskell-network/control
--- old-haskell-network/control	2015-02-23 11:36:13.630130306 +0000
+++ new-haskell-network/control	2015-02-23 11:36:13.630130306 +0000
@@ -2,8 +2,8 @@
 Section: haskell
 Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Joachim Breitner <nomeata at debian.org>
-Standards-Version: 3.9.4
+Uploaders: Joachim Breitner <nomeata at debian.org>, Dmitry Bogatov <KAction at gnu.org>
+Standards-Version: 3.9.6
 Build-Depends:
  debhelper (>= 9),
  haskell-devscripts (>= 0.9),
@@ -11,34 +11,36 @@
  cdbs,
  ghc,
  ghc-prof,
- ghc-doc,
  libghc-parsec3-dev,
  libghc-parsec3-prof,
+Build-Depends-Indep: ghc-doc,
  libghc-parsec3-doc,
- libghc-mtl-doc,
+ libghc-mtl-doc
 Homepage: http://hackage.haskell.org/package/network
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-network
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-network
+X-Description: Haskell low-level network library
+ Library `network' provides means to perform network
+ operations on level of ByteString's and sockets.
 
 Package: libghc-network-dev
 Architecture: any
 Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
-Description: Haskell network library for GHC
- This package provides a library for the Haskell programming language.
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
  .
- This library provides network-related facilities.
+ ${haskell:Blurb}
 
 Package: libghc-network-prof
 Architecture: any
 Depends: ${haskell:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${haskell:Provides}
-Description: Haskell network library for GHC; profiling libraries
- This package provides a library for the Haskell programming language,
- compiled for profiling.
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
  .
- This library provides network-related facilities.
+ ${haskell:Blurb}
 
 Package: libghc-network-doc
 Section: doc
@@ -46,9 +48,7 @@
 Depends: ${misc:Depends}, ${haskell:Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
-Description: Haskell network library for GHC; documentation
- This package provides the documentation for a library for the Haskell
- programming language.
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
  .
- This library provides network-related facilities.
-
+ ${haskell:Blurb}
diff -rN -u old-haskell-network/copyright new-haskell-network/copyright
--- old-haskell-network/copyright	2015-02-23 11:36:13.590130286 +0000
+++ new-haskell-network/copyright	2015-02-23 11:36:13.630130306 +0000
@@ -1,85 +1,38 @@
-This package was debianised by Ian Lynagh <igloo at debian.org> on
-Fri, 13 Oct 2006. All of the Debian packaging scripts are released
-into the public domain.
-
-It was downloaded from
-http://hackage.haskell.org/packages/archive/network/2.1.0.0/network-2.1.0.0.tar.gz
-
------
-
-Upstream Author: libraries at haskell.org
-
-Copyright (c) 2001, 2002, The University Court of the University of Glasgow
-Copyright (c) 2002, The GHC Team
-Copyright (c) 2003, Sigbjorn Finne
-Copyright (c) 2004, Graham Klyne
-All rights reserved.
-
-BSD licenced. The complete text of the BSD license can be found in
-/usr/share/common-licenses/BSD on Debian systems.
-
------
-
-configure is
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-
------
-
-config.guess and config.sub are
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-    This file 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.
-
-    As a special exception to the GNU General Public License, if you
-    distribute this file as part of a program that contains a
-    configuration script generated by Autoconf, you may include it under
-    the same distribution terms that you use for the rest of that program.
-
-The complete text of the GNU General Public License, version 2, can be
-found in /usr/share/common-licenses/GPL-2 on Debian systems.
-
------
-
-install-sh is
-
-Copyright (C) 1994 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the X Consor-
-tium.
-
-FSF changes to this file are in the public domain.
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: network
+Upstream-Contact: Johan Tibell <johan.tibell at gmail.com>
+Source: https://hackage.haskell.org/package/network
+
+Files: *
+Copyright: 2002-2010 The University Court of the University of Glasgow.
+           2007-2010 Johan Tibell
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: held by the contributors mentioned in debian/changelog
+License: BSD-3-clause
+
+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:
+ 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.