haskell-diagrams-lib: New upstream release

3 files changed, 66 insertions, 23 deletions

diff --git a/p/haskell-diagrams-lib/debian/changelog b/p/haskell-diagrams-lib/debian/changelog
index aea8fc2ea..25f0ddcda 100644
--- a/p/haskell-diagrams-lib/debian/changelog
+++ b/p/haskell-diagrams-lib/debian/changelog
@@ -1,3 +1,11 @@
+haskell-diagrams-lib (1.1.0.6-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Bump standards version, no change
+  * Upgrade copyright to DEP5 based on previous changelog entries
+
+ -- Raúl Benencia <rul@kalgan.cc>  Tue, 15 Apr 2014 12:50:43 -0300
+
 haskell-diagrams-lib (0.7.1.1-1) unstable; urgency=low
 
   * Adjust watch file to new hackage layout
diff --git a/p/haskell-diagrams-lib/debian/control b/p/haskell-diagrams-lib/debian/control
index 2e0bad006..dcee9b6b5 100644
--- a/p/haskell-diagrams-lib/debian/control
+++ b/p/haskell-diagrams-lib/debian/control
@@ -9,13 +9,13 @@ Build-Depends: debhelper (>= 9)
   , ghc
   , ghc-prof
   , libghc-semigroups-dev (>= 0.3.4)
-  , libghc-semigroups-dev (<< 0.10)
+  , libghc-semigroups-dev (<< 0.14)
   , libghc-semigroups-prof
   , libghc-monoid-extras-dev (>= 0.2.2)
   , libghc-monoid-extras-dev (<< 0.4)
   , libghc-monoid-extras-prof
-  , libghc-diagrams-core-dev (>= 0.6)
-  , libghc-diagrams-core-dev (<< 0.8)
+  , libghc-diagrams-core-dev (>= 1.1)
+  , libghc-diagrams-core-dev (<< 1.2)
   , libghc-diagrams-core-prof
   , libghc-active-dev (>= 0.1)
   , libghc-active-dev (<< 0.2)
@@ -23,36 +23,51 @@ Build-Depends: debhelper (>= 9)
   , libghc-vector-space-dev (>= 0.7.7)
   , libghc-vector-space-dev (<< 0.9)
   , libghc-vector-space-prof
-  , libghc-numinstances-dev (>= 1.2)
-  , libghc-numinstances-dev (<< 1.4)
-  , libghc-numinstances-prof
+  , libghc-vector-space-points-dev (>= 0.1.2)
+  , libghc-vector-space-points-dev (<< 0.3)
+  , libghc-vector-space-points-prof
   , libghc-colour-dev (>= 2.3.2)
   , libghc-colour-dev (<< 2.4)
   , libghc-colour-prof
   , libghc-data-default-class-dev (<< 0.1)
   , libghc-data-default-class-prof
-  , libghc-newtype-dev (>= 0.2)
-  , libghc-newtype-dev (<< 0.3)
-  , libghc-newtype-prof
   , libghc-fingertree-dev (>= 0.1)
   , libghc-fingertree-dev (<< 0.2)
   , libghc-fingertree-prof
-  , libghc-intervals-dev (>= 0.2.2)
-  , libghc-intervals-dev (<< 0.3)
+  , libghc-intervals-dev (>= 0.7)
+  , libghc-intervals-dev (<< 0.8)
   , libghc-intervals-prof
+  , libghc-lens-dev (>= 4.0)
+  , libghc-lens-dev (<< 4.2)
+  , libghc-lens-prof
+  , libghc-memotrie-dev (>= 0.6)
+  , libghc-memotrie-dev (<< 0.7)
+  , libghc-memotrie-prof
+  , libghc-optparse-applicative-dev (>= 0.7)
+  , libghc-optparse-applicative-dev (<< 0.9)
+  , libghc-optparse-applicative-prof
+  , libghc-safe-dev (>= 0.2)
+  , libghc-safe-dev (<< 0.4)
+  , libghc-safe-prof
+  , libghc-tagged-dev (>= 0.7)
+  , libghc-tagged-prof
 Build-Depends-Indep: ghc-doc
   , libghc-semigroups-doc
   , libghc-monoid-extras-doc
   , libghc-diagrams-core-doc
   , libghc-active-doc
   , libghc-vector-space-doc
-  , libghc-numinstances-doc
+  , libghc-vector-space-points-doc
   , libghc-colour-doc
   , libghc-data-default-class-doc
-  , libghc-newtype-doc
   , libghc-fingertree-doc
   , libghc-intervals-doc
-Standards-Version: 3.9.4
+  , libghc-lens-doc
+  , libghc-memotrie-doc
+  , libghc-optparse-applicative-doc
+  , libghc-safe-doc
+  , libghc-tagged-doc
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/diagrams-lib
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-diagrams-lib
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-diagrams-lib
diff --git a/p/haskell-diagrams-lib/debian/copyright b/p/haskell-diagrams-lib/debian/copyright
index 6cb577eb4..f9d671753 100644
--- a/p/haskell-diagrams-lib/debian/copyright
+++ b/p/haskell-diagrams-lib/debian/copyright
@@ -1,35 +1,55 @@
-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: diagrams-lib
-Upstream-Contact: Jack Upstream Developer <upstream@example.com>
+Upstream-Contact: diagrams-discuss@googlegroups.com
 Source: http://hackage.haskell.org/package/diagrams-lib
 
-Copyright: 2011-2012 diagrams-lib team:
+Files: *
+Copyright: 2011-2014 diagrams-lib team:
+  Jan Bracker <jan.bracker@googlemail.com>
+  Daniel Bergey <bergey@alum.mit.edu>
+  Denys Duchier <denys.duchier@univ-orleans.fr>
+  Daniil Frumin <difrumin@gmail.com>
+  Niklas Haas <nand@lavabit.com>
   Peter Hall <peter.hall@memorphic.com>
   Claude Heiland-Allen <claudiusmaximus@goto10.org>
+  Deepak Jois <deepak.jois@gmail.com>
+  John Lato <jwlato@tsurucapital.com>
+  Chris Mears <chris@cmears.id.au>
+  Jeffrey Rosenbluth <jeffrey.rosenbluth@gmail.com>
   Ian Ross <ian@skybluetrades.net>
+  Carlos Scheidegger <cscheid@research.att.com>
   Michael Sloan <mgsloan@gmail.com>
+  Jim Snavely <ludflu@gmail.com>
   Kanchalai Suveepattananont <ksuvee@seas.upenn.edu>
   Scott Walck <walck@lvc.edu>
   Ryan Yates <fryguybob@gmail.com>
   Brent Yorgey <byorgey@cis.upenn.edu>
-License: BSD3
- All rights reserved.
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2012-2013 Joachim Breitner
+           2013 Clint Adams
+           2014 Raúl Benencia
+License: BSD-3-clause
 
+License: BSD-3-clause
+ All rights reserved.
+ .
  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 Brent Yorgey 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 FITNESS FOR