Merge.

5 files changed, 15 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 058a356ad..35c7bfa12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-14  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.0.25 released.
+
 2014-12-11  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.0.24 released.
diff --git a/TO_PORT b/TO_PORT
index 39a862199..45173d757 100644
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,9 @@
 ce1c03bfd420c537105525d65f0ce28deb9d0bb5
 e7fe121fedc6d837c5bc8ab31e4b36c50497c4cd
 250ff9430c5e3727e2c5e24f81bc6d05a8700b49
-df4337db7d2f94f430caaf1b89f41dfae777799b
\ No newline at end of file
+df4337db7d2f94f430caaf1b89f41dfae777799b
+46db828eab42862bf950b4690d9ad191faf9393e
+6921fc71f40fcebe76dad45ffc6204f2e3313e17
+f9e5452c8e07e7c6eed91141532db7c341414d07
+a3d9e62ff8e1068312a52460ca193abf87f6a6ad
+e0b8987596d7b5bb032900305e8ef522e795e8d8
diff --git a/debian/changelog b/debian/changelog
index b9eb372af..5e712621f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.0.24-1) UNRELEASED; urgency=low
+dcpomatic (2.0.25-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -203,8 +203,9 @@ dcpomatic (2.0.24-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 11 Dec 2014 22:57:22 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 14 Dec 2014 17:09:05 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 64e186603..e0ff91e6b 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -78,6 +78,7 @@ universal_copy_lib $ENV libboost_system "$WORK/$libs"
 universal_copy_lib $ENV libboost_filesystem "$WORK/$libs"
 universal_copy_lib $ENV libboost_thread "$WORK/$libs"
 universal_copy_lib $ENV libboost_date_time "$WORK/$libs"
+universal_copy_lib $ENV libboost_locale "$WORK/$libs"
 universal_copy_lib $ENV libxml++ "$WORK/$libs"
 universal_copy_lib $ENV libxslt "$WORK/$libs"
 universal_copy_lib $ENV libxml2 "$WORK/$libs"
diff --git a/wscript b/wscript
index 40ef15f86..1cd7b9d6f 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.24devel'
+VERSION = '2.0.25devel'
 
 def options(opt):
     opt.load('compiler_cxx')