# HG changeset patch
# User Paul Crowley <paul@lshift.net>
# Date 1315388481 -3600
# Node ID ed581082bb664077547a77b2c316c3a8300a3bf5
# Parent  f4696be23ebf09afe68305c5da153598685adf86# Parent  36400dcefb67ad5cd42ca77906c3ba3fad600d20
Merge default

diff -r f4696be23ebf -r ed581082bb66 CREDITS
--- a/CREDITS	Tue Sep 06 14:07:24 2011 +0100
+++ b/CREDITS	Wed Sep 07 10:41:21 2011 +0100
@@ -20,6 +20,7 @@
 Waldemar Augustyn <waldemar@astyn.com>
 Steven King <kingrst@gmail.com>
 Christian Perrier <bubulle@debian.org>
+Andrej Krpic <akrpic77@gmail.com>
 
 This credits file may be incomplete - please remind me about people I
 should add!
diff -r f4696be23ebf -r ed581082bb66 NEWS
--- a/NEWS	Tue Sep 06 14:07:24 2011 +0100
+++ b/NEWS	Wed Sep 07 10:41:21 2011 +0100
@@ -1,3 +1,10 @@
+====================
+mercurial-server 1.3
+====================
+
+* Missing entries in CREDITS
+* Release documentation
+
 ====================
 mercurial-server 1.2
 ====================
diff -r f4696be23ebf -r ed581082bb66 README
--- a/README	Tue Sep 06 14:07:24 2011 +0100
+++ b/README	Wed Sep 07 10:41:21 2011 +0100
@@ -6,7 +6,7 @@
 
 http://www.lshift.net/mercurial-server.html
 
-Copyright (C) 2008-2010 LShift Ltd.
+Copyright (C) 2008-2011 LShift Ltd.
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -40,4 +40,4 @@
 
 See doc/manual.docbook for the rest of the documentation.
 
-Paul Crowley, paul@lshift.net, 2010
+Paul Crowley, paul@lshift.net, 2011
diff -r f4696be23ebf -r ed581082bb66 dev/making-a-release
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/making-a-release	Wed Sep 07 10:41:21 2011 +0100
@@ -0,0 +1,31 @@
+These are more notes for myself than for anyone else's benefit, but
+I can never remember what all the steps are, so noting them here.
+
+Source changes:
+
+- Add stanza to NEWS file
+- Ensure setup.py version number is bumped
+- Fix the actual problems (updating NEWS and/or CREDITS as we go)
+- Test with dev/chroot-test/run-test
+- Ensure year in README is up to date
+- Switch to debian
+- Merge in default
+- Update Standards-Version
+- dev/debian-build/dbuild
+- dev/chroot-test/run-test
+- When all is well, tag default and debian
+- dev/debian-build/dbuild_release
+- dev/chroot-test/run-test
+
+Post source changes:
+
+- "hg push; hg push public" (also during development)
+- Mail files in build/debian to Debian sponsor
+- Copy orig tarball into
+  ~/hg/lshift-web-personal/personal/paul/mercurial-server/
+- Pull, update, add, push for lshift-web-personal
+- Update ~/hg/lshift-web/site/mercurial-server.xml
+- Push
+- Test that web page works.
+- Make a blog post
+- Post to the mercurial mailing list
diff -r f4696be23ebf -r ed581082bb66 setup.py
--- a/setup.py	Tue Sep 06 14:07:24 2011 +0100
+++ b/setup.py	Wed Sep 07 10:41:21 2011 +0100
@@ -7,7 +7,7 @@
     name="mercurial-server",
     description="Centralized Mercurial repository manager",
     url="http://www.lshift.net/mercurial-server.html",
-    version="1.1", # FIXME: infer this
+    version="1.3", # FIXME: infer this
     package_dir = {'': 'src'},
     packages = ["mercurialserver"],
     requires = ["mercurial"], # FIXME: what version?