diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-22 23:21:28 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-22 23:21:28 +0000 |
| commit | 90b84151b9817b33381187f678cb2fdd062ed785 (patch) | |
| tree | 85ef3c44b486dcc8e388f2cad65a8269cf9a860c | |
| parent | ef4cd174472dc1c4694d4451dc60b9292c60666b (diff) | |
| parent | ad0ddd25c94730bed174756a21c83a348c45687e (diff) | |
Merge branch '1.0' into 1.0-vob
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | platform/osx/make_dmg.sh | 1 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.32.in | 3 | ||||
| -rw-r--r-- | platform/windows/installer.nsi.64.in | 3 | ||||
| -rw-r--r-- | wscript | 2 |
6 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2013-11-22 Carl Hetherington <cth@carlh.net> + + * Version 1.34 released. + +2013-11-22 Carl Hetherington <cth@carlh.net> + + * Fix both OS X and Windows installers. + 2013-11-21 Carl Hetherington <cth@carlh.net> * Version 1.33 released. diff --git a/debian/changelog b/debian/changelog index 3d37ca5ed..fd971efe3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.33-1) UNRELEASED; urgency=low +dcpomatic (1.34-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -37,8 +37,9 @@ dcpomatic (1.33-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Thu, 21 Nov 2013 18:56:59 +0000 + -- Carl Hetherington <carl@d1stkfactory> Fri, 22 Nov 2013 23:07:30 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 5554249f2..ccff4d567 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -84,6 +84,7 @@ universal_copy $ENV lib/libxmlsec1*.dylib $WORK/$libs universal_copy $ENV lib/libzip*.dylib $WORK/$libs universal_copy $ENV lib/libquickmail*.dylib $WORK/$libs universal_copy $ENV lib/libcurl*.dylib $WORK/$libs +universal_copy $ENV lib/libffi*.dylib $WORK/$libs for obj in $WORK/$macos/dcpomatic $WORK/$macos/ffprobe $WORK/$libs/*.dylib; do deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh|libltdl)"` diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in index 4e1f7e94f..9b719f825 100644 --- a/platform/windows/installer.nsi.32.in +++ b/platform/windows/installer.nsi.32.in @@ -53,6 +53,9 @@ File "%static_deps%/bin/libjpeg-8.dll" File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_html_gcc_custom.dll" +File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" diff --git a/platform/windows/installer.nsi.64.in b/platform/windows/installer.nsi.64.in index cc83f38ee..c53c2cacc 100644 --- a/platform/windows/installer.nsi.64.in +++ b/platform/windows/installer.nsi.64.in @@ -63,6 +63,9 @@ File "%static_deps%/bin/libjpeg-8.dll" File "%static_deps%/bin/wxbase294u_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_core_gcc_custom.dll" File "%static_deps%/bin/wxmsw294u_adv_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_richtext_gcc_custom.dll" +File "%static_deps%/bin/wxmsw294u_html_gcc_custom.dll" +File "%static_deps%/bin/wxbase294u_xml_gcc_custom.dll" File "%static_deps%/bin/libcairo-2.dll" File "%static_deps%/bin/libfreetype-6.dll" File "%static_deps%/bin/libgthread-2.0-0.dll" @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.34pre' +VERSION = '1.35pre' def options(opt): opt.load('compiler_cxx') |