diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-03-01 20:05:46 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-03-01 20:05:46 +0000 |
| commit | fc487d8428b5cf7b05c5c2586341c714c8e8db32 (patch) | |
| tree | 07aec4c591d12cc44e16180bf62002cd66b4eabe | |
| parent | 2383ca831a84c358302459f1e4461f887e69535a (diff) | |
| parent | a5bb775f62a7d0925c830b1e0404d49f998109ca (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | src/lib/content_factory.cc | 4 | ||||
| -rw-r--r-- | src/wx/about_dialog.cc | 1 | ||||
| -rw-r--r-- | wscript | 2 |
5 files changed, 16 insertions, 5 deletions
@@ -1,5 +1,14 @@ 2016-03-01 Carl Hetherington <cth@carlh.net> + * Version 2.6.30 released. + +2016-03-01 c.hetherington <cth@carlh.net> + + * Fix failure to recognise image sequence directories + in some cases. + +2016-03-01 Carl Hetherington <cth@carlh.net> + * Version 2.6.29 released. 2016-03-01 Carl Hetherington <cth@carlh.net> diff --git a/debian/changelog b/debian/changelog index 83f4c7427..5a301fe50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.6.29-1) UNRELEASED; urgency=low +dcpomatic (2.6.30-1) UNRELEASED; urgency=low [ Carl Hetherington ] * New upstream release. @@ -386,8 +386,9 @@ dcpomatic (2.6.29-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Tue, 01 Mar 2016 01:01:32 +0000 + -- Carl Hetherington <carl@d1stkfactory> Tue, 01 Mar 2016 09:09:31 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index e1535c510..c3278e30e 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -101,9 +101,9 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path) LOG_GENERAL ("Checking file %1", i->path()); - if (boost::starts_with (i->path().leaf().string(), "._")) { + if (boost::starts_with (i->path().leaf().string(), "._") || i->path().leaf().string() == ".DS_Store") { /* We ignore these files */ - LOG_GENERAL ("Ignored %1 (starts with {._})", i->path()); + LOG_GENERAL ("Ignored %1 (starts with {._}, or .DS_Store)", i->path()); continue; } diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc index b61333ec9..1de043f5e 100644 --- a/src/wx/about_dialog.cc +++ b/src/wx/about_dialog.cc @@ -201,6 +201,7 @@ AboutDialog::AboutDialog (wxWindow* parent) supported_by.Add (wxT ("Jerome Cohen Olivar")); supported_by.Add (wxT ("Kevin Orman")); supported_by.Add (wxT ("Rui Pereira")); + supported_by.Add (wxT ("Denis Postle")); supported_by.Add (wxT ("Aditya Pratama")); supported_by.Add (wxT ("Ceridwen Productions")); supported_by.Add (wxT ("Ivan Pullman")); @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs, Context APPNAME = 'dcpomatic' -VERSION = '2.6.29devel' +VERSION = '2.6.30devel' def options(opt): opt.load('compiler_cxx') |