[Pkg-haskell-commits] darcs: haskell-dav: Undo xml-hamlet version change in debian/patches/unstable-backport

[Joachim Breitner]

Wed Feb  6 17:02:18 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Undo xml-hamlet version change in debian/patches/unstable-backport
  Ignore-this: 1773c90b842903c37679afc7300ebf26

    M ./changelog +6
    M ./control -2 +2
    M ./patches/unstable-backport -3 +2

Wed Feb  6 17:02:18 UTC 2013  Joachim Breitner <mail at joachim-breitner.de>
  * Undo xml-hamlet version change in debian/patches/unstable-backport
  Ignore-this: 1773c90b842903c37679afc7300ebf26
diff -rN -u old-haskell-dav//changelog new-haskell-dav//changelog
--- old-haskell-dav//changelog	2013-02-06 17:26:40.855718515 +0000
+++ new-haskell-dav//changelog	2013-02-06 17:26:40.951718652 +0000
@@ -1,3 +1,9 @@
+haskell-dav (0.3-2) UNRELEASED; urgency=low
+
+  * Undo xml-hamlet version change in debian/patches/unstable-backport
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 06 Feb 2013 18:01:14 +0100
+
 haskell-dav (0.3-1) unstable; urgency=low
 
   * New upstream release
diff -rN -u old-haskell-dav//control new-haskell-dav//control
--- old-haskell-dav//control	2013-02-06 17:26:40.855718515 +0000
+++ new-haskell-dav//control	2013-02-06 17:26:40.951718652 +0000
@@ -33,8 +33,8 @@
              , libghc-xml-conduit-dev (<< 0.7.0.3)
              , libghc-xml-conduit-dev
              , libghc-xml-conduit-prof
-             , libghc-xml-hamlet-dev (>> 0.3)
-             , libghc-xml-hamlet-dev (<< 0.3.0.2)
+             , libghc-xml-hamlet-dev (>> 0.4)
+             , libghc-xml-hamlet-dev (<< 0.5)
              , libghc-xml-hamlet-dev
              , libghc-xml-hamlet-prof
 Build-Depends-Indep: ghc-doc
diff -rN -u old-haskell-dav//patches/unstable-backport new-haskell-dav//patches/unstable-backport
--- old-haskell-dav//patches/unstable-backport	2013-02-06 17:26:40.855718515 +0000
+++ new-haskell-dav//patches/unstable-backport	2013-02-06 17:26:40.919718695 +0000
@@ -9,7 +9,7 @@
 Index: haskell-dav-0.3/DAV.cabal
 ===================================================================
 --- haskell-dav-0.3.orig/DAV.cabal	2013-02-06 18:00:32.733126700 +0100
-+++ haskell-dav-0.3/DAV.cabal	2013-02-06 18:00:32.725126701 +0100
++++ haskell-dav-0.3/DAV.cabal	2013-02-06 18:01:02.681125616 +0100
 @@ -25,38 +25,35 @@
    exposed-modules:  Network.Protocol.HTTP.DAV
    other-modules:    Network.Protocol.HTTP.DAV.TH
@@ -29,9 +29,8 @@
                       , resourcet >= 0.3
                       , transformers >= 0.3
 -                     , xml-conduit >= 1.0          && <= 1.1
--                     , xml-hamlet >= 0.4           && <= 0.5
 +                     , xml-conduit >= 0.7          && <= 0.7.0.3
-+                     , xml-hamlet >= 0.3           && <= 0.3.0.1
+                      , xml-hamlet >= 0.4           && <= 0.5
  executable hdav
    main-is:           hdav.hs
    ghc-options:       -Wall