From ec42b8d9ee79bb4ff1f92defd25a2a999ce0fc0e Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Tue, 8 Apr 2014 15:52:37 -0700
Subject: [PATCH] move towards per-package changelogs, clarify doc/RELNOTES.md
 status

---
 doc/{CHANGES.md => RELNOTES.md} | 26 ++++++++++++++++++++++++--
 hledger-web/CHANGES             | 22 ++++++++++++++++++++++
 hledger-web/CHANGES.md          | 19 -------------------
 hledger-web/hledger-web.cabal   |  2 +-
 hledger/CHANGES                 |  3 +++
 hledger/hledger.cabal           |  4 +++-
 6 files changed, 53 insertions(+), 23 deletions(-)
 rename doc/{CHANGES.md => RELNOTES.md} (98%)
 create mode 100644 hledger-web/CHANGES
 delete mode 100644 hledger-web/CHANGES.md
 create mode 100644 hledger/CHANGES

diff --git a/doc/CHANGES.md b/doc/RELNOTES.md
similarity index 98%
rename from doc/CHANGES.md
rename to doc/RELNOTES.md
index fad82a292..dbef69600 100644
--- a/doc/CHANGES.md
+++ b/doc/RELNOTES.md
@@ -1,8 +1,30 @@
+<!-- This is now a release-time snapshot of the master copy on the wiki
+  -- (http://hledger.org/release-notes), which in turn is derived from the 
+  -- per-package changelogs (hledger*/CHANGES).
+  -->
+
 # Release notes
 
-## unreleased
+## 2014/2/10 hledger-web 0.22.4
+
+* web: include the right unminified version of jquery.url.js (1.1) to avoid js breakage
+
+## 2014/2/10 hledger-web 0.22.3
+
+* web: fix version number reported by --version
+
+## 2014/2/10 hledger-web 0.22.2
+
+New:
+
+* web: new option `--static-root` to set the base url for static files
+
+Improved:
+
+* web: include unminified source of all javascript to help packagers (fixes #161)
+* web: work around clang-related build failures with OS X mavericks/XCode 5
+* web: allow blaze-html 0.7 (closes #159)
 
-- web: new option `--static-root` to set the base url for static files
 
 ## 2014/1/6 hledger 0.22.1
 
diff --git a/hledger-web/CHANGES b/hledger-web/CHANGES
new file mode 100644
index 000000000..2b39b3b3d
--- /dev/null
+++ b/hledger-web/CHANGES
@@ -0,0 +1,22 @@
+(unreleased)
+
+- allow warp 2.1
+
+0.22.4 (2014/2/10)
+
+- Fix: include the right unminified version of jquery.url.js (1.1) to avoid js breakage
+
+0.22.3 (2014/2/10)
+
+- Fix: version number reported by --version
+
+0.22.2 (2014/2/10)
+
+- new option --static-root to set the base url for static files
+- allow blaze-html 0.7 (#159)
+- Fix: include unminified source of all javascript to help packagers (#161)
+- Fix: work around clang-related build failures with OS X mavericks/XCode 5
+
+0.22.1 (2014/1/6) and older
+
+See http://hledger.org/release-notes or doc/CHANGES.md.
diff --git a/hledger-web/CHANGES.md b/hledger-web/CHANGES.md
deleted file mode 100644
index 7e29cc71f..000000000
--- a/hledger-web/CHANGES.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## 2014/2/10 hledger-web 0.22.4
-
-* web: include the right unminified version of jquery.url.js (1.1) to avoid js breakage
-
-## 2014/2/10 hledger-web 0.22.3
-
-* web: fix version number reported by --version
-
-## 2014/2/10 hledger-web 0.22.2
-
-New:
-
-* web: new option `--static-root` to set the base url for static files
-
-Improved:
-
-* web: include unminified source of all javascript to help packagers (fixes #161)
-* web: work around clang-related build failures with OS X mavericks/XCode 5
-* web: allow blaze-html 0.7 (closes #159)
diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
index 137825a4d..bbf50bd09 100644
--- a/hledger-web/hledger-web.cabal
+++ b/hledger-web/hledger-web.cabal
@@ -48,7 +48,7 @@ extra-source-files:
                 templates/homepage.julius
                 templates/homepage.lucius
                 templates/normalize.lucius
-                CHANGES.md
+                CHANGES
 
 source-repository head
     type:     git
diff --git a/hledger/CHANGES b/hledger/CHANGES
new file mode 100644
index 000000000..78a8d52e4
--- /dev/null
+++ b/hledger/CHANGES
@@ -0,0 +1,3 @@
+0.22.1 (2014/1/6) and older
+
+See http://hledger.org/release-notes or doc/CHANGES.md.
diff --git a/hledger/hledger.cabal b/hledger/hledger.cabal
index f19822976..6fd9c26dd 100644
--- a/hledger/hledger.cabal
+++ b/hledger/hledger.cabal
@@ -24,7 +24,9 @@ build-type:     Simple
 -- data-dir:       data
 -- data-files:
 extra-tmp-files:
-extra-source-files: tests/suite.hs
+extra-source-files: 
+                    tests/suite.hs
+                    CHANGES
 
 -- Cabal-Version:  >= 1.9.2
 -- Test-Suite test-hledger