haskell-diagrams-core: New upstream release

3 files changed, 43 insertions, 15 deletions

diff --git a/p/haskell-diagrams-core/debian/changelog b/p/haskell-diagrams-core/debian/changelog
index 3680674bf..b7dfa18ea 100644
--- a/p/haskell-diagrams-core/debian/changelog
+++ b/p/haskell-diagrams-core/debian/changelog
@@ -1,3 +1,11 @@
+haskell-diagrams-core (1.1.0.2-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:00:53 -0300
+
 haskell-diagrams-core (0.7.0.1-2) unstable; urgency=low
 
   [ Colin Watson ]
diff --git a/p/haskell-diagrams-core/debian/control b/p/haskell-diagrams-core/debian/control
index 7c96d601d..b244810e1 100644
--- a/p/haskell-diagrams-core/debian/control
+++ b/p/haskell-diagrams-core/debian/control
@@ -8,14 +8,14 @@ Build-Depends: debhelper (>= 9)
   , haskell-devscripts (>= 0.8.15)
   , ghc
   , ghc-prof
-  , libghc-semigroups-dev (>= 0.3.4)
-  , libghc-semigroups-dev (<< 0.12)
+  , libghc-semigroups-dev (>= 0.8.4)
+  , libghc-semigroups-dev (<< 0.14)
   , libghc-semigroups-prof
   , libghc-vector-space-dev (>= 0.8.4)
   , libghc-vector-space-dev (<< 0.9)
   , libghc-vector-space-prof
   , libghc-vector-space-points-dev (>= 0.1)
-  , libghc-vector-space-points-dev (<< 0.2)
+  , libghc-vector-space-points-dev (<< 0.3)
   , libghc-vector-space-points-prof
   , libghc-memotrie-dev (>= 0.4.7)
   , libghc-memotrie-dev (<< 0.7)
@@ -26,9 +26,12 @@ Build-Depends: debhelper (>= 9)
   , libghc-monoid-extras-dev (>= 0.3)
   , libghc-monoid-extras-dev (<< 0.4)
   , libghc-monoid-extras-prof
-  , libghc-dual-tree-dev (>= 0.1)
-  , libghc-dual-tree-dev (<< 0.2)
+  , libghc-dual-tree-dev (>= 0.2)
+  , libghc-dual-tree-dev (<< 0.3)
   , libghc-dual-tree-prof
+  , libghc-lens-dev (>= 4.0)
+  , libghc-lens-dev (<< 4.2)
+  , libghc-lens-prof
 Build-Depends-Indep: ghc-doc
   , libghc-semigroups-doc
   , libghc-vector-space-doc
@@ -37,7 +40,8 @@ Build-Depends-Indep: ghc-doc
   , libghc-newtype-doc
   , libghc-monoid-extras-doc
   , libghc-dual-tree-doc
-Standards-Version: 3.9.4
+  , libghc-lens-doc
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/diagrams-core
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-diagrams-core
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-diagrams-core
diff --git a/p/haskell-diagrams-core/debian/copyright b/p/haskell-diagrams-core/debian/copyright
index a43db342e..f98520828 100644
--- a/p/haskell-diagrams-core/debian/copyright
+++ b/p/haskell-diagrams-core/debian/copyright
@@ -1,32 +1,48 @@
-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-core
 Upstream-Contact: Brent Yorgey <diagrams-discuss@googlegroups.com>
 Source: http://hackage.haskell.org/package/diagrams-core
 
-Copyright: 2011-2012 diagrams-core team:
+Files: *
+Copyright: 2011-2014 diagrams-core team:
+  Daniel Bergey <bergey@alum.mit.edu>
+  Tad Doxsee <doxsee@pacbell.net>
+  Conal Elliott <conal@conal.net>
   Sam Griffin <sam.griffin@gmail.com>
-  Vilhelm Sjöberg <vilhelm.sjoberg@gmail.com>
+  Chris Mears <chris@cmears.id.au>
+  Jeffrey Rosenbluth <Jeffrey.Rosenbluth@gmail.com>
+  Carlos Scheidegger <cscheid@research.att.com>
+  Vilhelm Sjöberg <vilhelm.sjoberg@gmail.com>
+  Michael Sloan <mgsloan@gmail.com>
   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-2014 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