Merge branch 'master' of github.com:simonmichael/hledger

Makefile

@@ -816,11 +816,10 @@ DOWNLOAD.md: $(VERSIONFILE)
 tagrelease:
 	git tag -a $(VERSION)
 
-# display a hackage upload command reminder
-hackageupload:
-	for p in $(PACKAGES); do cabal upload $$p/dist/$$p-$(VERSION).tar.gz -v2; done
-
 hackageupload-dry:
+	for p in $(PACKAGES); do cabal upload $$p/dist/$$p-$(VERSION).tar.gz -v2 --check; done
+
+hackageupload:
 	for p in $(PACKAGES); do cabal upload $$p/dist/$$p-$(VERSION).tar.gz -v2; done
 
 # send unpushed patches to the mail list
@@ -888,11 +887,27 @@ showreleaseauthors:
 	@darcs changes --from-tag $(FROMTAG) |grep '^\w' |cut -c 31- |sort |uniq
 	@echo
 
-showloc sloccount:
+showloc:
 	@echo Current lines of code including tests:
 	@sloccount `ls $(SOURCEFILES)` | grep haskell:
 	@echo
 
+sloc:
+	@sloccount hledger-lib hledger hledger-web
+
+cloc:
+	@echo
+	@echo "Lines of code as of `date`:"
+	@echo
+	@echo "hledger-lib, hledger"
+	@cloc -q hledger-lib hledger             2>&1 | grep -v 'defined('
+	@echo
+	@echo "hledger-web"
+	@cloc -q hledger-web                     2>&1 | grep -v 'defined('
+	@echo
+	@echo "hledger-lib, hledger, hledger-web"
+	@cloc -q hledger-lib hledger hledger-web 2>&1 | grep -v 'defined('
+
 showtestcount:
 	@echo "Unit tests:"
 	@hledger test 2>&1 | cut -d' ' -f2

NEWS.md

@@ -4,6 +4,12 @@ title: hledger news
 
 # News
 
+## 2013/7/10 hledger-web 0.21.3
+
+  - drop yesod-platform dependency, it is not worthwhile. The other
+    yesod dependencies are currently without version ranges, so cabal
+    install might require --constraint to restrict them in some cases.
+
 ## 2013/6/23 hledger 0.21.3
 
   - csv: fix wrong application of multiple assignments in a conditional block

hledger-web/hledger-web.cabal

@@ -139,7 +139,6 @@ library
                    , yaml
                    , yesod
                    , yesod-core
-                   , yesod-platform       >= 1.2.0.1 && < 1.3
                    , yesod-static
                    , json
 
@@ -231,7 +230,6 @@ executable         hledger-web
                    , yaml
                    , yesod
                    , yesod-core
-                   , yesod-platform       >= 1.2.0.1 && < 1.3
                    , yesod-static
                    , json