[Pkg-haskell-commits] darcs: haskell-network-uri: Finish packaging

Mon Feb 23 12:33:07 UTC 2015

Mon Feb 23 12:30:54 UTC 2015  KAction at gnu.org
  * Finish packaging
  
    - Disable tests
    - Write more suitable description
    - Fix lintian warnings
    - Fix deprecated license naming
  

    M ./changelog -2 +2
    M ./control -49 +17
    M ./copyright -4 +4
    M ./rules -3 +1

Mon Feb 23 12:30:54 UTC 2015  KAction at gnu.org
  * Finish packaging
  
    - Disable tests
    - Write more suitable description
    - Fix lintian warnings
    - Fix deprecated license naming
  
diff -rN -u old-haskell-network-uri/changelog new-haskell-network-uri/changelog

--- old-haskell-network-uri/changelog	2015-02-23 12:33:07.067512007 +0000
+++ new-haskell-network-uri/changelog	2015-02-23 12:33:07.071512008 +0000
@@ -1,5 +1,5 @@
-haskell-network-uri (2.6.0.1-1) experimental; urgency=low
+haskell-network-uri (2.6.0.1-1) UNRELEASED; urgency=low
 
-  * Initial Debian package release.
+  * Initial release (Closes: #779024)
 
  -- Christopher Reichert <creichert07 at gmail.com>  Sun, 21 Dec 2014 21:41:10 -0600
diff -rN -u old-haskell-network-uri/control new-haskell-network-uri/control
--- old-haskell-network-uri/control	2015-02-23 12:33:07.067512007 +0000
+++ new-haskell-network-uri/control	2015-02-23 12:33:07.071512008 +0000
@@ -2,57 +2,25 @@
 Priority: extra
 Section: haskell
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
-Uploaders: Christopher Reichert <creichert07 at gmail.com>
-Build-Depends: debhelper (>= 7.0),
+Uploaders: Christopher Reichert <creichert07 at gmail.com>, Dmitry Bogatov <KAction at gnu.org>
+Build-Depends: debhelper (>= 9.0),
  haskell-devscripts (>= 0.9),
  cdbs,
  ghc,
  ghc-prof,
- libghc-network-dev,
- libghc-network-prof,
  libghc-parsec3-dev (>= 3.0),
  libghc-parsec3-dev (<< 3.2),
- libghc-parsec3-prof (>= 3) | libghc-parsec3-prof (<< 3.2),
- libghc-hunit-dev,
- libghc-hunit-prof,
- libghc-test-framework-dev,
- libghc-test-framework-prof,
- libghc-test-framework-hunit-dev,
- libghc-test-framework-hunit-prof,
- libghc-test-framework-quickcheck2-dev,
- libghc-test-framework-quickcheck2-prof
+ libghc-parsec3-prof 
 Build-Depends-Indep: ghc-doc,
- libghc-network-doc,
- libghc-parsec3-doc (>= 3) | libghc-parsec3-doc (<< 3.2),
- libghc-hunit-doc,
- libghc-test-framework-doc,
- libghc-test-framework-hunit-doc,
- libghc-test-framework-quickcheck2-doc
+ libghc-parsec3-doc,
 Standards-Version: 3.9.6
 Homepage: http://hackage.haskell.org/package/network-uri
-X-Description: URI manipulation
- This package provides an URI manipulation inteface.
- .
- In network-2.6 the @Network.URI@ module was split off from the
- network package into this package. If you're using the @Network.URI@
- module you can automatically get it from the right package by adding
- this to your .cabal file:
- .
- > flag network-uri
- >   description: Get Network.URI from the network-uri package
- >   default: True
- >
- > library
- >   -- ...
- >   if flag(network-uri)
- >     build-depends: network-uri >= 2.6, network >= 2.6
- >   else
- >     build-depends: network-uri < 2.6, network < 2.6
- .
- That is, get the module from either network < 2.6 or from
- network-uri >= 2.6.
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-network-uri
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-network-uri
+X-Description: URI manipulation
+ Library defines functions for handling URIs. It presents substantially 
+ the same interface as the older GHC Network.URI module, but is implemented 
+ using Parsec rather than a Regex library.
 
 Package: libghc-network-uri-dev
 Architecture: any
@@ -64,9 +32,9 @@
 Conflicts: ${haskell:Conflicts},
 Provides: ${haskell:Provides},
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
-  ${haskell:LongDescription}
-  .
-  ${haskell:Blurb}
+ ${haskell:LongDescription}
+ .
+ ${haskell:Blurb}
 
 Package: libghc-network-uri-prof
 Architecture: any
@@ -77,9 +45,9 @@
 Conflicts: ${haskell:Conflicts},
 Provides: ${haskell:Provides},
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
-  ${haskell:LongDescription}
-  .
-  ${haskell:Blurb}
+ ${haskell:LongDescription}
+ .
+ ${haskell:Blurb}
 
 Package: libghc-network-uri-doc
 Architecture: all
@@ -90,6 +58,6 @@
 Suggests: ${haskell:Suggests},
 Conflicts: ${haskell:Conflicts},
 Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
-  ${haskell:LongDescription}
-  .
-  ${haskell:Blurb}
+ ${haskell:LongDescription}
+ .
+ ${haskell:Blurb}
diff -rN -u old-haskell-network-uri/copyright new-haskell-network-uri/copyright
--- old-haskell-network-uri/copyright	2015-02-23 12:33:07.063512006 +0000
+++ new-haskell-network-uri/copyright	2015-02-23 12:33:07.071512008 +0000
@@ -6,13 +6,13 @@
 Files: *
 Copyright: Copyright (c) 2007-2010, Johan Tibell,
            Copyright (c) 2002-2010, The University Court of the University of Glasgow.
-License: BSD3
+License: BSD-3-clause
 
 Files: debian/*
-Copyright: Copyright (c) 2014, Christopher Reichert <creichert07 at gmail.com>
-License: BSD3
+License: BSD-3-clause 
+Copyright: held by the contributors mentioned in debian/changelog
 
-License: BSD3
+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:
  .
diff -rN -u old-haskell-network-uri/rules new-haskell-network-uri/rules
--- old-haskell-network-uri/rules	2015-02-23 12:33:07.063512006 +0000
+++ new-haskell-network-uri/rules	2015-02-23 12:33:07.071512008 +0000
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-#DEB_CABAL_PACKAGE = network-uri
-#DEB_DEFAULT_COMPILER = ghc
-DEB_ENABLE_TESTS = yes
+DEB_CABAL_PACKAGE = network-uri
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk


