[Pkg-haskell-commits] darcs: gitit: Merge

[Joachim Breitner]

Wed Feb  6 16:47:47 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge
  Ignore-this: 4fc8b9bcd680af431ca80e7f3006c8f9

    M ./changelog -4 +2
    M ./control -59 +31

Wed Feb  6 16:47:47 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Merge
  Ignore-this: 4fc8b9bcd680af431ca80e7f3006c8f9
diff -rN -u old-gitit//changelog new-gitit//changelog
--- old-gitit//changelog	2013-02-06 16:48:27.400021929 +0000
+++ new-gitit//changelog	2013-02-06 16:48:27.411990057 +0000
@@ -1,13 +1,11 @@
-gitit (0.10.0.1-2) UNRELEASED; urgency=low
+gitit (0.10.1.2-1) UNRELEASED; urgency=low
 
-  [ Joachim Breitner ]
   * Depend on haskell-devscripts 0.8.13 to ensure this package is built
     against experimental
   * Bump standards version, no change
   * New upstream release
-  * New upstream release
 
- -- Joachim Breitner <nomeata at debian.org>  Sat, 13 Oct 2012 14:07:06 +0200
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 06 Feb 2013 17:35:48 +0100
 
 gitit (0.10.0.1-1) unstable; urgency=low
 
diff -rN -u old-gitit//control new-gitit//control
--- old-gitit//control	2013-02-06 16:48:27.351918539 +0000
+++ new-gitit//control	2013-02-06 16:48:27.411990057 +0000
@@ -74,42 +74,25 @@
  , libghc-highlighting-kate-prof
  , libghc-text-prof
  , libghc-random-prof
- , libghc-network-prof (>= 2.1.0.0)
- , libghc-network-prof (<< 2.4)
- , libghc-utf8-string-prof (>= 0.3)
- , libghc-utf8-string-prof (<< 0.4)
- , libghc-sha-prof (>= 1)
- , libghc-sha-prof (<< 1.6)
- , libghc-http-prof (>= 1:4000.0)
- , libghc-http-prof (<< 1:4000.3)
- , libghc-hstringtemplate-prof (>= 0.6)
- , libghc-hstringtemplate-prof (<< 0.7)
- , libghc-recaptcha-prof (>= 0.1)
- , libghc-filestore-prof (>> 0.5)
- , libghc-filestore-prof (<< 0.6)
- , libghc-zlib-prof (>= 0.5)
- , libghc-zlib-prof (<< 0.6)
- , libghc-url-prof (>= 2.1)
- , libghc-url-prof (<< 2.2)
- , libghc-happstack-server-prof (>= 6.6)
- , libghc-happstack-server-prof (<< 7.1)
- , libghc-base64-bytestring-prof (>= 0.1)
- , libghc-base64-bytestring-prof (<< 0.2)
- , libghc-xml-prof (>= 1.3.5)
- , libghc-hslogger-prof (>= 1)
- , libghc-hslogger-prof (<< 1.2)
- , libghc-configfile-prof (>= 1)
- , libghc-configfile-prof (<< 1.2)
- , libghc-feed-prof (>= 0.3.6)
- , libghc-feed-prof (<< 0.4)
- , libghc-xss-sanitize-prof (>= 0.3)
- , libghc-xss-sanitize-prof (<< 0.4)
- , libghc-tagsoup-prof (>= 0.12)
- , libghc-tagsoup-prof (<< 0.13)
- , libghc-blaze-html-prof (>= 0.4)
- , libghc-blaze-html-prof (<< 0.5)
- , libghc-json-prof (>= 0.4)
- , libghc-json-prof (<< 0.6)
+ , libghc-network-prof
+ , libghc-utf8-string-prof
+ , libghc-sha-prof 
+ , libghc-http-prof 
+ , libghc-hstringtemplate-prof
+ , libghc-recaptcha-prof
+ , libghc-filestore-prof
+ , libghc-zlib-prof
+ , libghc-url-prof
+ , libghc-happstack-server-prof
+ , libghc-base64-bytestring-prof
+ , libghc-xml-prof
+ , libghc-hslogger-prof
+ , libghc-configfile-prof
+ , libghc-feed-prof
+ , libghc-xss-sanitize-prof
+ , libghc-tagsoup-prof
+ , libghc-blaze-html-prof
+ , libghc-json-prof
  , libghc-ghc-paths-prof
  , libghc-safe-prof
 Build-Depends-Indep: ghc-doc
@@ -131,29 +114,18 @@
  , libghc-hstringtemplate-doc
  , libghc-recaptcha-doc
  , libghc-filestore-doc
- , libghc-zlib-doc (>= 0.5)
- , libghc-zlib-doc (<< 0.6)
- , libghc-url-doc (>= 2.1)
- , libghc-url-doc (<< 2.2)
- , libghc-happstack-server-doc (>= 6.6)
- , libghc-happstack-server-doc (<< 7.1)
- , libghc-base64-bytestring-doc (>= 0.1)
- , libghc-base64-bytestring-doc (<< 0.2)
- , libghc-xml-doc (>= 1.3.5)
- , libghc-hslogger-doc (>= 1)
- , libghc-hslogger-doc (<< 1.2)
- , libghc-configfile-doc (>= 1)
- , libghc-configfile-doc (<< 1.2)
- , libghc-feed-doc (>= 0.3.6)
- , libghc-feed-doc (<< 0.4)
- , libghc-xss-sanitize-doc (>= 0.3)
- , libghc-xss-sanitize-doc (<< 0.4)
- , libghc-tagsoup-doc (>= 0.12)
- , libghc-tagsoup-doc (<< 0.13)
- , libghc-blaze-html-doc (>= 0.4)
- , libghc-blaze-html-doc (<< 0.5)
- , libghc-json-doc (>= 0.4)
- , libghc-json-doc (<< 0.6)
+ , libghc-zlib-doc
+ , libghc-url-doc
+ , libghc-happstack-server-doc
+ , libghc-base64-bytestring-doc
+ , libghc-xml-doc
+ , libghc-hslogger-doc
+ , libghc-configfile-doc
+ , libghc-feed-doc
+ , libghc-xss-sanitize-doc
+ , libghc-tagsoup-doc
+ , libghc-blaze-html-doc
+ , libghc-json-doc
  , libghc-ghc-paths-doc
  , libghc-safe-doc
 Standards-Version: 3.9.4