haskell-uulib: Use standard substvars

2 files changed, 24 insertions, 39 deletions

diff --git a/p/haskell-uulib/debian/changelog b/p/haskell-uulib/debian/changelog
index 013c31e18..093cf211d 100644
--- a/p/haskell-uulib/debian/changelog
+++ b/p/haskell-uulib/debian/changelog
@@ -3,6 +3,7 @@ haskell-uulib (0.9.16-1) UNRELEASED; urgency=low
   * Adjust watch file to new hackage layout
   * Depend on haskell-devscripts 0.9, found in experimental
   * New upstream release
+  * Use standard substvars
 
  -- Joachim Breitner <nomeata@debian.org>  Sat, 20 Dec 2014 19:58:15 +0100
 
diff --git a/p/haskell-uulib/debian/control b/p/haskell-uulib/debian/control
index f5afcce68..f8d011ade 100644
--- a/p/haskell-uulib/debian/control
+++ b/p/haskell-uulib/debian/control
@@ -14,15 +14,7 @@ Standards-Version: 3.9.4
 Vcs-Darcs: http://darcs.debian.org/pkg-haskell/haskell-uulib/
 Vcs-Browser: http://darcs.debian.org/cgi-bin/darcsweb.cgi?r=pkg-haskell/haskell-uulib
 Homepage: http://www.cs.uu.nl/wiki/HUT/WebHome
-
-Package: libghc-uulib-dev
-Architecture: any
-Section: haskell
-Depends: ${haskell:Depends}
- , ${misc:Depends}
-Suggests: ${haskell:Suggests}
-Provides: ${haskell:Provides}
-Description: parser and pretty print combinator library for GHC
+X-Description: parser and pretty print combinator library for GHC
  The uulib Haskell library contains fast, error repairing parser
  combinators (UU.Parsing), pretty print combinators (UU.Pretty) and a
  set of data structures and algorithms for working with sets and
@@ -31,46 +23,38 @@ Description: parser and pretty print combinator library for GHC
  The library is developed at Utrecht University and is part of the
  Haskell Utrecht Tools.
 
+Package: libghc-uulib-dev
+Architecture: any
+Depends: ${haskell:Depends}
+  , ${shlibs:Depends}
+  , ${misc:Depends}
+Recommends: ${haskell:Recommends}
+Suggests: ${haskell:Suggests}
+Provides: ${haskell:Provides}
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
+ .
+ ${haskell:Blurb}
 
 Package: libghc-uulib-prof
 Architecture: any
-Section: haskell
 Depends: ${haskell:Depends}
- , ${misc:Depends}
+  , ${misc:Depends}
+Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
-Description: profiling parser and pretty print combinator library for GHC
- The uulib Haskell library contains fast, error repairing parser
- combinators (UU.Parsing), pretty print combinators (UU.Pretty) and a
- set of data structures and algorithms for working with sets and
- sequences (UU.DData) for Haskell.
- .
- The library is developed at Utrecht University and is part of the
- Haskell Utrecht Tools.
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
  .
- This package contains additional profiling libraries which can be
- used with ghcprof.
-
-
+ ${haskell:Blurb}
 
 Package: libghc-uulib-doc
-Replaces: haskell-uulib-doc (<< 0.9.10-2)
-Conflicts: haskell-uulib-doc (<< 0.9.10-2)
-Provides: haskell-uulib-doc
-Architecture: all
 Section: doc
-Depends: ${haskell:Depends}
-  , ${misc:Depends}
+Architecture: all
+Depends: ${misc:Depends}, ${haskell:Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
-Description: API documentation for uulib Haskell library
- The API documentation of the uulib parser and pretty print combinator
- library.
+Description: ${haskell:ShortDescription}${haskell:ShortBlurb}
+ ${haskell:LongDescription}
  .
- The uulib Haskell library contains fast, error repairing parser
- combinators (UU.Parsing), pretty print combinators (UU.Pretty) and a
- set of data structures and algorithms for working with sets and
- sequences (UU.DData) for Haskell.
- .
- The library is developed at Utrecht University and is part of the
- Haskell Utrecht Tools.
+ ${haskell:Blurb}