Merge master.

4 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index a650dbf20..c044e5450 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
 	* Bump ffmpeg version.
 
+2014-10-06  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.74.0 released.
+
+2014-10-06  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.73.9 released.
+
 2014-09-28  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.73.8 released.
diff --git a/cscript b/cscript
index b76617c4d..5b9c3669b 100644
--- a/cscript
+++ b/cscript
@@ -208,7 +208,7 @@ def package_debian(target, cpu, version):
     target.set('CDIST_PKG_CONFIG_PATH', target.get('PKG_CONFIG_PATH'))
     if target.version == 'unstable':
         target.set('CDIST_EXTRA_CONFIGURE', '--debian-unstable')
-    target.command('dpkg-buildpackage')
+    target.command('dpkg-buildpackage -uc -us')
     
     debs = []
     for p in glob.glob('../*.deb'):
diff --git a/debian/changelog b/debian/changelog
index fe31a1bf8..29e5d1a2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.73.8-1) UNRELEASED; urgency=low
+dcpomatic (1.74.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -184,8 +184,10 @@ dcpomatic (1.73.8-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 28 Sep 2014 23:54:07 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 06 Oct 2014 20:50:41 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 3da81ce4b..e06cb53f2 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.73.8devel'
+VERSION = '1.74.0devel'
 
 def options(opt):
     opt.load('compiler_cxx')