Fix merge.

4 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7cf20305e..716a130d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
 	Trusting the header will speed up the "Examine Content" job by
 	a factor of about 2, which is handy for large films.
 
+2012-12-10  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.59 released.
+
 2012-12-09  Carl Hetherington  <cth@carlh.net>
 
 	* Version 0.59beta5 released.
diff --git a/builds/all-deb b/builds/all-deb
new file mode 100755
index 000000000..65af83e1b
--- /dev/null
+++ b/builds/all-deb
@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+builds/deb 12.04 64
+builds/deb 12.10 64
+builds/deb 12.04 32
+builds/deb 12.10 32
diff --git a/debian/changelog b/debian/changelog
index d66f98dbf..d5d003686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.59-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Mon, 10 Dec 2012 20:58:19 +0000
+
 dvdomatic (0.59beta5-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/release b/release
index ca777b009..e9a29ff00 100755
--- a/release
+++ b/release
@@ -40,7 +40,7 @@ if args.beta:
 
 new_version = version.rewrite_wscript(m)
 version.append_to_changelog(new_version)
-command("dch -v %s-1 \"New upstream release.\"" % new_version)
+command("dch -b -v %s-1 \"New upstream release.\"" % new_version)
 
 command("./waf clean")
 command("./waf dist")