Merge branch '1.0' of ssh://carlh.dyndns.org/home/carl/git/dvdomatic into 1.0

5 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2fb4906a1..caa04e3b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-08  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.07 released.
+
 2013-10-01  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.06 released.
diff --git a/debian/changelog b/debian/changelog
index e204ee9b7..5f74ead67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.06-1) UNRELEASED; urgency=low
+dcpomatic (1.07-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -10,8 +10,9 @@ dcpomatic (1.06-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 01 Oct 2013 16:30:21 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 08 Oct 2013 18:59:58 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in
index 536038f0b..d9ea0f5c9 100644
--- a/platform/windows/installer.nsi.32.in
+++ b/platform/windows/installer.nsi.32.in
@@ -73,6 +73,7 @@ File "%static_deps%/bin/libxmlsec1-openssl.dll"
 File "%static_deps%/bin/libexslt-0.dll"
 File "%static_deps%/bin/libxslt-1.dll"
 File "%static_deps%/bin/libffi-6.dll"
+File "%static_deps%/bin/openssl.exe"
 
 File "%cdist_deps%/bin/asdcp-libdcp.dll"
 File "%cdist_deps%/bin/kumu-libdcp.dll"
diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in
index 1bedd3fba..4f564acba 100644
--- a/platform/windows/installer.nsi.64.in
+++ b/platform/windows/installer.nsi.64.in
@@ -83,6 +83,7 @@ File "%static_deps%/bin/libxmlsec1-openssl.dll"
 File "%static_deps%/bin/libexslt-0.dll"
 File "%static_deps%/bin/libxslt-1.dll"
 File "%static_deps%/bin/libffi-6.dll"
+File "%static_deps%/bin/openssl.exe"
 
 File "%cdist_deps%/bin/asdcp-libdcp.dll"
 File "%cdist_deps%/bin/kumu-libdcp.dll"
diff --git a/wscript b/wscript
index cd08261f3..55d08fe56 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.07pre'
+VERSION = '1.08pre'
 
 def options(opt):
     opt.load('compiler_cxx')