Merge master.

[dcpomatic.git] / release

diff --git a/release b/release
index bef5648dd9f3b5ee6c50bb98eb374c7477803149..e9a29ff002fd14bd06440a25ac5f958c2f6b32bc 100755 (executable)
--- a/release
+++ b/release
@@ -40,10 +40,9 @@ if args.beta:
 
 new_version = version.rewrite_wscript(m)
 version.append_to_changelog(new_version)
+command("dch -b -v %s-1 \"New upstream release.\"" % new_version)
 
 command("./waf clean")
-command("./waf configure")
-command("./waf")
 command("./waf dist")
 
 check_diff_with_user()
@@ -51,7 +50,7 @@ check_diff_with_user()
 command("git commit -a -m \"Bump version\"")
 command("git tag -m \"v%s\" v%s" % (new_version, new_version))
 
-if args.release:
+if args.full:
     version.rewrite_wscript(version.Version.bump_and_to_pre)
     check_diff_with_user()
     command("git commit -a -m \"Bump version\"")