haskell-diagrams-cairo: New upstream release

3 files changed, 52 insertions, 17 deletions

diff --git a/p/haskell-diagrams-cairo/debian/changelog b/p/haskell-diagrams-cairo/debian/changelog
index 8937a05b1..002ff9dd7 100644
--- a/p/haskell-diagrams-cairo/debian/changelog
+++ b/p/haskell-diagrams-cairo/debian/changelog
@@ -1,3 +1,10 @@
+haskell-diagrams-cairo (1.1.0.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Bump standards version, no change
+
+ -- Raúl Benencia <rul@kalgan.cc>  Tue, 15 Apr 2014 15:07:02 -0300
+
 haskell-diagrams-cairo (0.7-1) unstable; urgency=low
 
   * Adjust watch file to new hackage layout
diff --git a/p/haskell-diagrams-cairo/debian/control b/p/haskell-diagrams-cairo/debian/control
index 71d695845..83a05aaa2 100644
--- a/p/haskell-diagrams-cairo/debian/control
+++ b/p/haskell-diagrams-cairo/debian/control
@@ -11,18 +11,30 @@ Build-Depends: debhelper (>= 9)
   , libghc-mtl-dev (>= 2.0)
   , libghc-mtl-dev (<< 2.2)
   , libghc-mtl-prof
-  , libghc-diagrams-core-dev (>= 0.7)
-  , libghc-diagrams-core-dev (<< 0.8)
+  , libghc-diagrams-core-dev (>= 1.0)
+  , libghc-diagrams-core-dev (<< 1.2)
   , libghc-diagrams-core-prof
-  , libghc-diagrams-lib-dev (>= 0.7)
-  , libghc-diagrams-lib-dev (<< 0.8)
+  , libghc-diagrams-lib-dev (>= 1.0.1)
+  , libghc-diagrams-lib-dev (<< 1.2)
   , libghc-diagrams-lib-prof
   , libghc-cairo-dev (>= 0.12.4)
   , libghc-cairo-dev (<< 0.13)
   , libghc-cairo-prof
-  , libghc-cmdargs-dev (>= 0.6)
-  , libghc-cmdargs-dev (<< 0.11)
-  , libghc-cmdargs-prof
+  , libghc-data-default-class-dev (>= 0.0.1)
+  , libghc-data-default-class-dev (<< 0.1)
+  , libghc-data-default-class-prof
+  , libghc-juicypixels-dev (>= 3.1.3.2)
+  , libghc-juicypixels-dev (<< 3.2)
+  , libghc-juicypixels-prof
+  , libghc-lens-dev (>= 3.8)
+  , libghc-lens-dev (<< 4.2)
+  , libghc-lens-prof
+  , libghc-optparse-applicative-dev (>= 0.7)
+  , libghc-optparse-applicative-dev (<< 0.9)
+  , libghc-optparse-applicative-prof
+  , libghc-statestack-dev (>= 0.2)
+  , libghc-statestack-dev (<< 0.3)
+  , libghc-statestack-prof
   , libghc-split-dev (>= 0.1.2)
   , libghc-split-dev (<< 0.3)
   , libghc-split-prof
@@ -31,9 +43,13 @@ Build-Depends-Indep: ghc-doc
   , libghc-diagrams-core-doc
   , libghc-diagrams-lib-doc
   , libghc-cairo-doc
-  , libghc-cmdargs-doc
+  , libghc-data-default-class-doc
+  , libghc-juicypixels-doc
+  , libghc-lens-doc
+  , libghc-optparse-applicative-doc
   , libghc-split-doc
-Standards-Version: 3.9.4
+  , libghc-statestack-doc
+Standards-Version: 3.9.5
 Homepage: http://hackage.haskell.org/package/diagrams-cairo
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-diagrams-cairo
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-diagrams-cairo
diff --git a/p/haskell-diagrams-cairo/debian/copyright b/p/haskell-diagrams-cairo/debian/copyright
index 084b0b35c..36e1dfa40 100644
--- a/p/haskell-diagrams-cairo/debian/copyright
+++ b/p/haskell-diagrams-cairo/debian/copyright
@@ -1,35 +1,47 @@
-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-cairo
 Upstream-Contact: Brent Yorgey <diagrams-discuss@googlegroups.com>
 Source: http://hackage.haskell.org/package/diagrams-cairo
 
-Copyright: 2011-2012 diagrams-cairo team:
+Files: *
+Copyright: 2011-2013 diagrams-cairo team:
+  Daniel Bergey <bergey@alum.mit.edu>
   Sam Griffin <sam.griffin@gmail.com>
+  Niklas Haas <nand@lavabit.com>
   John Lato <jwlato@gmail.com>
+  Jeffrey Rosenbluth <Jeffrey.Rosenbluth@gmail.com>
   Ian Ross <ian@skybluetrades.net>
   Michael Sloan <mgsloan@gmail.com>
   Luite Stegeman <stegeman@gmail.com>
   Kanchalai Suveepattananont <ksuvee@seas.upenn.edu>
+  Robert Vollmert <rvollmert@gmx.net>
   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
+           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