[Pkg-haskell-commits] darcs: haskell-hledger-web: New upstream version 0.18.
Clint Adams
clint at debian.org
Wed May 30 01:47:02 UTC 2012
Wed May 30 01:47:00 UTC 2012 Clint Adams <clint at debian.org>
* New upstream version 0.18.
Ignore-this: 6433ef094453c640cb853a04e241212f
M ./changelog +6
M ./control -30 +18
R ./patches/embed-static-content.diff
M ./patches/series -1
M ./patches/use-unminified-excanvas.diff -7 +7
Wed May 30 01:47:00 UTC 2012 Clint Adams <clint at debian.org>
* New upstream version 0.18.
Ignore-this: 6433ef094453c640cb853a04e241212f
diff -rN -u old-haskell-hledger-web//changelog new-haskell-hledger-web//changelog
--- old-haskell-hledger-web//changelog 2012-05-30 01:47:02.188824881 +0000
+++ new-haskell-hledger-web//changelog 2012-05-30 01:47:02.192828528 +0000
@@ -1,3 +1,9 @@
+haskell-hledger-web (0.18-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Clint Adams <clint at debian.org> Tue, 29 May 2012 21:16:41 -0400
+
haskell-hledger-web (0.17.2~0307-2) unstable; urgency=low
* Embed static content in hledger-web binary. closes: #668622.
diff -rN -u old-haskell-hledger-web//control new-haskell-hledger-web//control
--- old-haskell-hledger-web//control 2012-05-30 01:47:02.172826585 +0000
+++ new-haskell-hledger-web//control 2012-05-30 01:47:02.192828528 +0000
@@ -6,49 +6,37 @@
Build-Depends: haskell-devscripts (>= 0.8)
, ghc
, ghc-ghci
- , libghc-blaze-html-dev (>> 0.4.3.1)
, libghc-blaze-html-dev (<< 0.5)
, libghc-cabal-file-th-dev
- , libghc-clientsession-dev (>> 0.7.3)
- , libghc-clientsession-dev (<< 0.8)
+ , libghc-clientsession-dev
, libghc-cmdargs-dev (>> 0.9.1)
, libghc-cmdargs-dev (<< 0.10)
- , libghc-file-embed-dev (>> 0.0)
- , libghc-file-embed-dev (<< 0.1)
- , libghc-hamlet-dev (>> 0.10)
- , libghc-hamlet-dev (<< 0.11)
- , libghc-hledger-dev (>> 0.17)
- , libghc-hledger-dev (<< 0.17.1)
- , libghc-hledger-lib-dev (>> 0.17)
- , libghc-hledger-lib-dev (<< 0.17.1)
+ , libghc-hamlet-dev
+ , libghc-hledger-dev (>> 0.18)
+ , libghc-hledger-dev (<< 0.18-999)
+ , libghc-hledger-lib-dev (>> 0.18)
+ , libghc-hledger-lib-dev (<< 0.18-999)
, libghc-hunit-dev
, libghc-io-storage-dev (>> 0.3)
, libghc-io-storage-dev (<< 0.4)
- , libghc-monad-control-dev (>> 0.3)
- , libghc-monad-control-dev (<< 0.4)
+ , libghc-network-conduit-dev
, libghc-parsec3-dev
, libghc-regexpr-dev (>> 0.5.1)
, libghc-safe-dev (>> 0.2)
- , libghc-shakespeare-text-dev (>> 0.10)
- , libghc-shakespeare-text-dev (<< 0.11)
+ , libghc-shakespeare-text-dev
, libghc-text-dev (>> 0.11)
, libghc-text-dev (<< 0.12)
, libghc-transformers-dev (>> 0.2)
- , libghc-transformers-dev (<< 0.3)
- , libghc-wai-dev (>> 1.1)
- , libghc-wai-dev (<< 1.2)
- , libghc-wai-extra-dev (>> 1.1)
- , libghc-wai-extra-dev (<< 1.2)
- , libghc-warp-dev (>> 1.1.0.1)
- , libghc-warp-dev (<< 1.2)
- , libghc-yaml-dev (>> 0.5)
- , libghc-yaml-dev (<< 0.6)
- , libghc-yesod-core-dev (>> 0.10)
- , libghc-yesod-core-dev (<< 0.11)
- , libghc-yesod-default-dev (>> 0.6)
- , libghc-yesod-default-dev (<< 0.7)
- , libghc-yesod-static-dev (>> 0.10)
- , libghc-yesod-static-dev (<< 0.11)
+ , libghc-transformers-dev (<< 0.4)
+ , libghc-wai-dev
+ , libghc-wai-extra-dev
+ , libghc-warp-dev
+ , libghc-yaml-dev
+ , libghc-yesod-dev (>> 1.0)
+ , libghc-yesod-dev (<< 1.1)
+ , libghc-yesod-core-dev
+ , libghc-yesod-default-dev
+ , libghc-yesod-static-dev
, libjs-jquery
Standards-Version: 3.9.3
Homepage: http://hackage.haskell.org/package/hledger-web
diff -rN -u old-haskell-hledger-web//patches/embed-static-content.diff new-haskell-hledger-web//patches/embed-static-content.diff
--- old-haskell-hledger-web//patches/embed-static-content.diff 2012-05-30 01:47:02.129359485 +0000
+++ new-haskell-hledger-web//patches/embed-static-content.diff 1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
---- a/Hledger/Web/Settings/StaticFiles.hs
-+++ b/Hledger/Web/Settings/StaticFiles.hs
-@@ -11,19 +11,22 @@
- -}
- module Hledger.Web.Settings.StaticFiles where
-
--import Prelude (IO)
-+import System.IO
- import Yesod.Static
- import qualified Yesod.Static as Static
-
-+import Prelude
- import Hledger.Web.Settings (staticDir)
-
- -- | use this to create your static file serving site
- staticSite :: IO Static.Static
--staticSite =
-+staticSite = do
- #ifdef DEVELOPMENT
-+ putStrLn ("using web files from: " ++ staticDir ++ "/") >> hFlush stdout
- Static.staticDevel staticDir
- #else
-- Static.static staticDir
-+ putStrLn "using embedded web files" >> hFlush stdout
-+ return $(Static.embed staticDir)
- #endif
-
- -- | This generates easy references to files in the static directory at compile time,
diff -rN -u old-haskell-hledger-web//patches/series new-haskell-hledger-web//patches/series
--- old-haskell-hledger-web//patches/series 2012-05-30 01:47:02.129359485 +0000
+++ new-haskell-hledger-web//patches/series 2012-05-30 01:47:02.196830349 +0000
@@ -1,2 +1 @@
use-unminified-excanvas.diff
-embed-static-content.diff
diff -rN -u old-haskell-hledger-web//patches/use-unminified-excanvas.diff new-haskell-hledger-web//patches/use-unminified-excanvas.diff
--- old-haskell-hledger-web//patches/use-unminified-excanvas.diff 2012-05-30 01:47:02.110090442 +0000
+++ new-haskell-hledger-web//patches/use-unminified-excanvas.diff 2012-05-30 01:47:02.196830349 +0000
@@ -1,11 +1,11 @@
--- a/Hledger/Web/Foundation.hs
+++ b/Hledger/Web/Foundation.hs
-@@ -88,7 +88,7 @@
- <script type=text/javascript src=@{StaticR jquery_js}
- <script type=text/javascript src=@{StaticR jquery_url_js}
- <script type=text/javascript src=@{StaticR jquery_flot_js}
+@@ -79,7 +79,7 @@
+ <script type=text/javascript src=@{StaticR jquery_js}>
+ <script type=text/javascript src=@{StaticR jquery_url_js}>
+ <script type=text/javascript src=@{StaticR jquery_flot_js}>
- <!--[if lte IE 8]><script language="javascript" type="text/javascript" src="excanvas.min.js"></script><![endif]-->
+ <!--[if lte IE 8]><script language="javascript" type="text/javascript" src="excanvas.js"></script><![endif]-->
- <script type=text/javascript src=@{StaticR dhtmlxcommon_js}
- <script type=text/javascript src=@{StaticR dhtmlxcombo_js}
- <script type=text/javascript src=@{StaticR hledger_js}
+ <script type=text/javascript src=@{StaticR dhtmlxcommon_js}>
+ <script type=text/javascript src=@{StaticR dhtmlxcombo_js}>
+ <script type=text/javascript src=@{StaticR hledger_js}>
More information about the Pkg-haskell-commits
mailing list