Merge branch 'master' of git.carlh.net:git/dcpomatic

5 files changed, 28 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 047628602..82ee2675e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-14  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.74.3 released.
+
 2014-10-08  c.hetherington  <cth@carlh.net>
 
 	* Make server finding more reliable when
diff --git a/debian/changelog b/debian/changelog
index e0ce39fd5..efd8fd73d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.74.2-1) UNRELEASED; urgency=low
+dcpomatic (1.74.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -188,8 +188,9 @@ dcpomatic (1.74.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 08 Oct 2014 10:37:21 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 14 Oct 2014 18:38:17 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 619dfff5e..dd27a7552 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,18 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	./waf --nocache install --destdir=debian/dcpomatic
+	mkdir -p debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/
+	cp -a /usr/local/share/locale/de/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/dcpomatic-wxstd.mo
+	mkdir -p debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/
+	cp -a /usr/local/share/locale/es/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/dcpomatic-wxstd.mo
+	mkdir -p debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/
+	cp -a /usr/local/share/locale/fr/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/dcpomatic-wxstd.mo
+	mkdir -p debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/
+	cp -a /usr/local/share/locale/it/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/dcpomatic-wxstd.mo
+	mkdir -p debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/
+	cp -a /usr/local/share/locale/sv/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/dcpomatic-wxstd.mo
+	mkdir -p debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/
+	cp -a /usr/local/share/locale/nl/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/dcpomatic-wxstd.mo
 
 .PHONY: override_dh_strip
 override_dh_strip:
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 1e501f54f..7f15217f1 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -280,6 +280,14 @@ dcpomatic_setup_i18n ()
 		locale->AddCatalogLookupPathPrefix (POSIX_LOCALE_PREFIX);
 #endif
 
+#ifdef DCPOMATIC_LINUX
+		/* We have to include the wxWidgets .mo in our distribution,
+		   so we rename it to avoid clashes with any other installation
+		   of wxWidgets.
+		*/
+		locale->AddCatalog (wxT ("dcpomatic-wxstd"));
+#endif		
+		
 		locale->AddCatalog (wxT ("libdcpomatic-wx"));
 		locale->AddCatalog (wxT ("dcpomatic"));
 		
diff --git a/wscript b/wscript
index d9d410ae2..784cb777e 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '1.74.2devel'
+VERSION = '1.74.3devel'
 
 def options(opt):
     opt.load('compiler_cxx')