updating utils to deal with the newly split-out changelogs

diff --git a/utils/build-releasenote b/utils/build-releasenote
index 1dee649752008ef0405cf44e05c86a16dd891bbb..cac08694139fea89926e408ff74b22c6008e2c47 100755 (executable)
--- a/utils/build-releasenote
+++ b/utils/build-releasenote
@@ -1,10 +1,18 @@
 #!/bin/bash
 
-VERSION=`head -n1 packaging/debian/changelog | sed 's/.*(\([^)]*\)).*/\1/'`
+# script to build a release announcement for the Monkeysphere
+# if you're running this, you probably also want to read through
+# the checklist in utils/preparing-release.
+
+# Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# Copyright: © 2008-2010
+# License: GPL, v3 or later
+
+VERSION=`head -n1 changelog | sed 's/.*(\([^)]*\)).*/\1/'`
 
 { 
     sed "s/__VERSION__/$VERSION/g" < utils/releasenote.header
-    head -n$(( $(grep -n '^ --' packaging/debian/changelog  | head -n1 | cut -f1 -d:) - 2 )) packaging/debian/changelog | tail -n+3
+    head -n$(( $(grep -n '^ --' changelog  | head -n1 | cut -f1 -d:) - 2 )) changelog | tail -n+3
     sed "s/__VERSION__/$VERSION/g" < utils/releasenote.footer
 } > "website/news/release-$VERSION.mdwn"
 

diff --git a/utils/preparing-release b/utils/preparing-release
index 3273c1cb45da9a5629e93df2a784483151bf2746..8ecbc00c1b03d014906b14cf5b33058120a502b0 100644 (file)
--- a/utils/preparing-release
+++ b/utils/preparing-release
@@ -1,7 +1,7 @@
 ### Notes about preparing a release for the monkeysphere ###
 
- * make sure that packaging/debian/changelog has a reasonable version
-   number.
+ * make sure that changelog and packaging/debian/changelog both have
+   reasonable version numbers.
 
  * have the monkeysphere archive signing key handy!