[Pkg-haskell-commits] darcs: haskell-xml-conduit: Fake-merge

[Clint Adams]

Sat May 25 17:48:14 UTC 2013  Clint Adams <clint at debian.org>
  * Fake-merge
  Ignore-this: cfbf6867af5183f9ae2dd0068896bdf8

    M ./changelog +11
    M ./compat -1 +1
    M ./control -11 +7

Sat May 25 17:48:14 UTC 2013  Clint Adams <clint at debian.org>
  * Fake-merge
  Ignore-this: cfbf6867af5183f9ae2dd0068896bdf8
diff -rN -u old-haskell-xml-conduit//changelog new-haskell-xml-conduit//changelog
--- old-haskell-xml-conduit//changelog	2013-05-25 17:52:13.263220906 +0000
+++ new-haskell-xml-conduit//changelog	2013-05-25 17:52:13.263220906 +0000
@@ -1,3 +1,14 @@
+haskell-xml-conduit (1.1.0.2-2) unstable; urgency=low
+
+  [ Joachim Breitner ]
+  * Enable compat level 9
+  * Use substvars for Haskell description blurbs
+
+  [ Clint Adams ]
+  * New upstream version
+
+ -- Clint Adams <clint at debian.org>  Sat, 25 May 2013 13:47:13 -0400
+
 haskell-xml-conduit (1.1.0.2-1) experimental; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-xml-conduit//compat new-haskell-xml-conduit//compat
--- old-haskell-xml-conduit//compat	2013-05-25 17:52:13.263220906 +0000
+++ new-haskell-xml-conduit//compat	2013-05-25 17:52:13.263220906 +0000
@@ -1 +1 @@
-7
+9
diff -rN -u old-haskell-xml-conduit//control new-haskell-xml-conduit//control
--- old-haskell-xml-conduit//control	2013-05-25 17:52:13.263220906 +0000
+++ new-haskell-xml-conduit//control	2013-05-25 17:52:13.267042183 +0000
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders: Clint Adams <clint at debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
   , cdbs
   , haskell-devscripts (>= 0.8.13)
   , ghc
@@ -82,14 +82,13 @@
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
-Description: HTTP client package with conduit interface and HTTPS support
+Description: HTTP client package with conduit interface and HTTPS support${haskell:ShortBlurb}
  This package uses attoparsec for parsing the actual contents of the HTTP
  connection. It also provides higher-level functions which allow you to avoid
  direct usage of conduits. See http://www.yesodweb.com/book/xml-conduit
  for more information.
  .
- This package provides a library for the Haskell programming language.
- See http://www.haskell.org/ for more information on Haskell.
+ ${haskell:Blurb}
 
 Package: libghc-xml-conduit-prof
 Architecture: any
@@ -98,14 +97,13 @@
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
 Provides: ${haskell:Provides}
-Description: HTTP/HTTPS client package with conduit interface, profiling libraries
+Description: HTTP/HTTPS client package with conduit interface${haskell:ShortBlurb}
  This package uses attoparsec for parsing the actual contents of the HTTP
  connection. It also provides higher-level functions which allow you to avoid
  direct usage of conduits. See http://www.yesodweb.com/book/xml-conduit
  for more information.
  .
- This package provides a library for the Haskell programming language, compiled
- for profiling.  See http://www.haskell.org/ for more information on Haskell.
+ ${haskell:Blurb}
 
 Package: libghc-xml-conduit-doc
 Section: doc
@@ -113,12 +111,10 @@
 Depends: ${misc:Depends}, ${haskell:Depends}
 Recommends: ${haskell:Recommends}
 Suggests: ${haskell:Suggests}
-Description: HTTP client package with conduit interface and HTTPS support; documentation
+Description: HTTP client package with conduit interface and HTTPS support${haskell:ShortBlurb}
  This package uses attoparsec for parsing the actual contents of the HTTP
  connection. It also provides higher-level functions which allow you to avoid
  direct usage of conduits. See http://www.yesodweb.com/book/xml-conduit
  for more information.
  .
- This package provides the documentation for a library for the Haskell
- programming language.
- See http://www.haskell.org/ for more information on Haskell.
+ ${haskell:Blurb}