Merge branch 'release-0.22.1'

Conflicts:
	NEWS.md
	hledger-lib/hledger-lib.cabal

Makefile

@@ -349,7 +349,7 @@ committest: hlinttest unittest doctest functest haddocktest warningstest quickca
 
 # thorough pre-release tests - run before release
 # consider hiding dev-build symlinks in Hledger/ first
-releasetest: Clean unittest doctest functest warningstest fullcabaltest haddocktest
+releasetest: Clean unittest functest fullcabaltest haddocktest #warningstest doctest
 
 hlinttest hlint:
 	hlint --hint=hlint --report=hlint.html $(SOURCEFILES)
@@ -430,8 +430,16 @@ quickcabaltest:
 
 # make sure cabal is happy in all possible ways
 fullcabaltest:
-	(for p in $(PACKAGES); do (echo "testing $$p package" && cd $$p && cabal clean && cabal check && cabal install && cabal sdist && cabal upload dist/$$p-$(VERSION).tar.gz --check -v3); done \
+	(for p in $(PACKAGES); do ( \
+		printf "\ntesting $$p package\n" \
+		&& cd $$p \
+		&& cabal clean \
+		&& cabal check \
+		&& cabal install \
+		&& cabal sdist \
+		); done \
 		&& echo $@ PASSED) || echo $@ FAILED
+#		&& cabal upload dist/$$p-$(VERSION).tar.gz --check -v3 \
 
 # run simple performance benchmarks without saving results
 # Requires some commands defined in bench.tests and some BENCHEXES defined above.
@@ -818,7 +826,7 @@ DOWNLOAD.md: $(VERSIONFILE)
 	perl -p -e "s/hledger(|-chart|-web|-vty)-[0-9.]+-/hledger\1-$(VERSION)-/g" -i $@
 
 tagrelease:
-	git tag -a $(VERSION)
+	git tag $(VERSION)
 
 hackageupload-dry:
 	for p in $(PACKAGES); do cabal upload $$p/dist/$$p-$(VERSION).tar.gz -v2 --check; done

NEWS.md

@@ -8,6 +8,14 @@ title: hledger news
 
 - web: new option `--static-root` to set the base url for static files
 
+## 2014/1/6 hledger 0.22.1
+
+- require the latest pretty-show so hledger installation no longer
+  needs an upgraded version of happy, and the docs build on hackage
+
+- require regex-tdfa directly instead of regex-compat-tdfa,
+  simplifying Debian packaging
+
 ## 2013/12/13 hledger 0.22
 
 **New:**

VERSION

@@ -1 +1 @@
-0.22
+0.22.1

hledger-lib/hledger-lib.cabal

@@ -1,5 +1,5 @@
 name:           hledger-lib
-version: 0.22
+version: 0.22.1
 stability:      beta
 category:       Finance
 synopsis:       Core data types, parsers and utilities for the hledger accounting tool.
@@ -67,7 +67,7 @@ library
                  ,old-locale
                  ,old-time
                  ,parsec
-                 ,pretty-show
+                 ,pretty-show >= 1.6.4
                  ,regex-tdfa
                  ,regexpr >= 0.5.1
                  ,safe >= 0.2
@@ -99,7 +99,7 @@ test-suite tests
                , old-locale
                , old-time
                , parsec
-               , pretty-show
+               , pretty-show >= 1.6.4
                , regex-tdfa
                , regexpr
                , safe

hledger-web/hledger-web.cabal

@@ -1,5 +1,5 @@
 name:           hledger-web
-version: 0.22
+version: 0.22.1
 stability:      beta
 category:       Finance
 synopsis:       A web interface for the hledger accounting tool.
@@ -66,7 +66,7 @@ flag library-only
     Default:       False
 
 library
-    cpp-options:   -DVERSION="0.22"
+    cpp-options:   -DVERSION="0.22.1"
     if flag(dev) || flag(library-only)
         cpp-options: -DDEVELOPMENT
  
@@ -109,8 +109,8 @@ library
                      Hledger.Web.Options
                      -- Setup -- stops yesod devel complaining, requires build-depends: Cabal
     build-depends:
-                     hledger              == 0.22
-                   , hledger-lib          == 0.22
+                     hledger              == 0.22.1
+                   , hledger-lib          == 0.22.1
                    , base                 >= 4 && < 5
                    , bytestring
                    , clientsession
@@ -157,7 +157,7 @@ executable         hledger-web
     if flag(library-only)
         Buildable: False
 
-    cpp-options:   -DVERSION="0.22"
+    cpp-options:   -DVERSION="0.22.1"
     if flag(dev)
         cpp-options:   -DDEVELOPMENT
 
@@ -201,8 +201,8 @@ executable         hledger-web
                      Hledger.Web.Options
 
     build-depends:
-                     hledger              == 0.22
-                   , hledger-lib          == 0.22
+                     hledger              == 0.22.1
+                   , hledger-lib          == 0.22.1
                    , base                 >= 4 && < 5
                    , bytestring
                    , clientsession

hledger/hledger.cabal

@@ -1,6 +1,6 @@
 name:           hledger
 -- also in cpp-options below
-version: 0.22
+version: 0.22.1
 stability:      beta
 category:       Finance
 synopsis:       The main command-line interface for the hledger accounting tool.
@@ -41,7 +41,7 @@ flag threaded
     Default:       True
 
 library
-  cpp-options:    -DVERSION="0.22"
+  cpp-options:    -DVERSION="0.22.1"
   ghc-options:    -W
   -- should be the same as below
   exposed-modules:
@@ -62,7 +62,7 @@ library
                   Hledger.Cli.Stats
   -- should be the same as below
   build-depends:
-                  hledger-lib == 0.22
+                  hledger-lib == 0.22.1
                  ,base >= 4.3 && < 5
                  -- ,cabal-file-th
                  ,containers
@@ -113,13 +113,13 @@ executable hledger
                   Hledger.Cli.Print
                   Hledger.Cli.Register
                   Hledger.Cli.Stats
-  cpp-options:    -DVERSION="0.22"
+  cpp-options:    -DVERSION="0.22.1"
   ghc-options:    -W
   if flag(threaded)
        ghc-options:   -threaded
  -- should be the same as above
   build-depends:
-                  hledger-lib == 0.22
+                  hledger-lib == 0.22.1
                  ,base >= 4.3 && < 5
                  ,containers
                  ,cmdargs >= 0.10 && < 0.11
@@ -162,9 +162,8 @@ test-suite tests
                , old-locale
                , old-time
                , parsec
-               , pretty-show
+               , pretty-show >= 1.6.4
                , process
-               , regex-compat-tdfa
                , regexpr
                , safe
                , shakespeare-text