[Pkg-haskell-commits] darcs: haskell-hledger-web: New upstream version 0.16.5.

[Clint Adams]

Wed Jan 25 01:48:56 UTC 2012  Clint Adams <clint at debian.org>
  * New upstream version 0.16.5.
  Ignore-this: 418d15d1b87f1ebd6378d7faee1b95c2

    M ./changelog +7
    M ./control -1 +2
    R ./patches/cope-with-yesod-clash.diff
    A ./patches/newer-cmdargs.diff
    M ./patches/series -1 +1
    M ./rules +1

Wed Jan 25 01:48:56 UTC 2012  Clint Adams <clint at debian.org>
  * New upstream version 0.16.5.
  Ignore-this: 418d15d1b87f1ebd6378d7faee1b95c2
diff -rN -u old-haskell-hledger-web//changelog new-haskell-hledger-web//changelog
--- old-haskell-hledger-web//changelog	2012-01-25 01:49:04.873853990 +0000
+++ new-haskell-hledger-web//changelog	2012-01-25 01:49:04.878846939 +0000
@@ -1,3 +1,10 @@
+haskell-hledger-web (0.16.5-1) unstable; urgency=low
+
+  * New upstream version.
+  * Build with newer cmdargs.  closes: #655792.
+
+ -- Clint Adams <clint at debian.org>  Tue, 24 Jan 2012 20:11:16 -0500
+
 haskell-hledger-web (0.16.3-1) unstable; urgency=low
 
   * New upstream version.
diff -rN -u old-haskell-hledger-web//control new-haskell-hledger-web//control
--- old-haskell-hledger-web//control	2012-01-25 01:49:04.849831700 +0000
+++ new-haskell-hledger-web//control	2012-01-25 01:49:04.878846939 +0000
@@ -8,9 +8,10 @@
   , ghc-ghci
   , libghc-aeson-dev (>> 0.3.2.11)
   , libghc-blaze-html-dev
+  , libghc-cabal-file-th-dev
   , libghc-clientsession-dev
   , libghc-cmdargs-dev (>> 0.8)
-  , libghc-cmdargs-dev (<< 0.9)
+  , libghc-cmdargs-dev (<< 0.10)
   , libghc-data-object-dev
   , libghc-data-object-yaml-dev
   , libghc-failure-dev (>> 0.1)
diff -rN -u old-haskell-hledger-web//patches/cope-with-yesod-clash.diff new-haskell-hledger-web//patches/cope-with-yesod-clash.diff
--- old-haskell-hledger-web//patches/cope-with-yesod-clash.diff	2012-01-25 01:49:04.849831700 +0000
+++ new-haskell-hledger-web//patches/cope-with-yesod-clash.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
---- a/Hledger/Web/Application.hs
-+++ b/Hledger/Web/Application.hs
-@@ -15,7 +15,7 @@
- import Yesod.Logger (makeLogger, flushLogger, Logger, logLazyText, logString)
- import Yesod.Static
- 
--import Hledger.Web.Foundation
-+import Hledger.Web.Foundation hiding (AppConfig,loadConfig,appPort)
- import Hledger.Web.Handlers
- import Hledger.Web.Options
- import Hledger.Web.Settings
---- a/Hledger/Web.hs
-+++ b/Hledger/Web.hs
-@@ -14,7 +14,7 @@
- where
- import Test.HUnit
- 
--import Hledger.Web.Foundation
-+import Hledger.Web.Foundation hiding (AppConfig, loadConfig, appPort, appEnv, appRoot)
- import Hledger.Web.Application
- import Hledger.Web.Handlers
- import Hledger.Web.Options
diff -rN -u old-haskell-hledger-web//patches/newer-cmdargs.diff new-haskell-hledger-web//patches/newer-cmdargs.diff
--- old-haskell-hledger-web//patches/newer-cmdargs.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-hledger-web//patches/newer-cmdargs.diff	2012-01-25 01:49:04.878846939 +0000
@@ -0,0 +1,11 @@
+--- a/hledger-web.cabal
++++ b/hledger-web.cabal
+@@ -77,7 +77,7 @@
+                  ,base >= 4 && < 5
+                  ,bytestring
+                  ,cabal-file-th
+-                 ,cmdargs >= 0.8   && < 0.9
++                 ,cmdargs >= 0.8   && < 0.10
+                  ,directory
+                  ,filepath
+                  ,old-locale
diff -rN -u old-haskell-hledger-web//patches/series new-haskell-hledger-web//patches/series
--- old-haskell-hledger-web//patches/series	2012-01-25 01:49:04.849831700 +0000
+++ new-haskell-hledger-web//patches/series	2012-01-25 01:49:04.878846939 +0000
@@ -1,3 +1,3 @@
 use-regular-aeson.diff
 use-unminified-excanvas.diff
-cope-with-yesod-clash.diff
+newer-cmdargs.diff
diff -rN -u old-haskell-hledger-web//rules new-haskell-hledger-web//rules
--- old-haskell-hledger-web//rules	2012-01-25 01:49:04.845838025 +0000
+++ new-haskell-hledger-web//rules	2012-01-25 01:49:04.882835916 +0000
@@ -11,6 +11,7 @@
 clean:
 	$(checkdir)
 	rm -f build-arch stamp-configure
+	rm -f debian/substvars debian/files
 	rm -rf dist debian/$(package)
 
 build: build-arch build-indep