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

diff --git a/ChangeLog b/ChangeLog
index 04762860200054e2bc0a9b493c828cc73777f771..82ee2675e5288050400adcd05e3ba41c3e91c2d0 100644 (file)
--- 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 e0ce39fd5ad1e31d3708d976b0cf115007cf80de..efd8fd73d4432fd303580e0b94bbfc7df631578b 100644 (file)
--- 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 619dfff5ea6d4afce35cebadf39e0993cd9901d1..dd27a7552479569ce627b0c8886aa87aadedf0c0 100755 (executable)
--- 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 1e501f54fd5650a892b0ab5a2d189ba950482eac..7f15217f14a65490345aacf3a4b81551de8f892c 100644 (file)
--- 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 d9d410ae27c37585b380d5f99e27f24c9c6f6bbf..784cb777ed4b328b7fd963ccd61a6621860e3c4a 100644 (file)
--- 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')