From 697a8bc1b361eaa7f21ef32bcdde756926d9bc9b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 8 Sep 2015 16:36:04 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 676cc7bfb..ebec4b007 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-09-08 Carl Hetherington + + * Version 2.1.57 released. + 2015-09-08 c.hetherington * Missing libsamplerate dylib for OS X. diff --git a/debian/changelog b/debian/changelog index 99106de60..543c9c7dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.1.56-1) UNRELEASED; urgency=low +dcpomatic (2.1.57-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -287,8 +287,9 @@ dcpomatic (2.1.56-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 06 Sep 2015 12:58:09 +0100 + -- Carl Hetherington Tue, 08 Sep 2015 16:36:03 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 9ca3d183a..e6dea08b9 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.56devel' +VERSION = '2.1.57' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 9a3613d9a68440db5cb648ac3ee05a0ef53a8811 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 8 Sep 2015 16:36:04 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index e6dea08b9..5889610ff 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.57' +VERSION = '2.1.57devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From fd3ce3bf3b35612952cfbdaab0bfa3aa0542d0c8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 9 Sep 2015 00:16:01 +0100 Subject: Properly fix OS X libsamplerate --- ChangeLog | 5 +++++ platform/osx/make_dmg.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ebec4b007..6f4d9cb30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-09-09 Carl Hetherington + + * Actually fix missing libsamplerate + dylib for OS X. + 2015-09-08 Carl Hetherington * Version 2.1.57 released. diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 6791282ff..cbc703c36 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -112,7 +112,7 @@ universal_copy_lib $ENV libpango "$WORK/$libs" universal_copy_lib $ENV libcairo "$WORK/$libs" universal_copy_lib $ENV libpixman "$WORK/$libs" universal_copy_lib $ENV libharfbuzz "$WORK/$libs" -universal_copy_lib $ENV libswresample "$WORK/$libs" +universal_copy_lib $ENV libsamplerate "$WORK/$libs" relink=`echo $relink | sed -e "s/\+//g"` -- cgit v1.2.3 From 9c104bee81c117e204d5c2e940e797f7a9b917f5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 9 Sep 2015 00:16:38 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f4d9cb30..653534d36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-09-09 Carl Hetherington + + * Version 2.1.58 released. + 2015-09-09 Carl Hetherington * Actually fix missing libsamplerate diff --git a/debian/changelog b/debian/changelog index 543c9c7dc..da3e732f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.1.57-1) UNRELEASED; urgency=low +dcpomatic (2.1.58-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -288,8 +288,9 @@ dcpomatic (2.1.57-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Tue, 08 Sep 2015 16:36:03 +0100 + -- Carl Hetherington Wed, 09 Sep 2015 00:16:38 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 5889610ff..bbe83ea34 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.57devel' +VERSION = '2.1.58' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 5f6ee203ec06970bac3ecd89e5b0780ed9b04f77 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 9 Sep 2015 00:16:39 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index bbe83ea34..03c0dc047 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.58' +VERSION = '2.1.58devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3