Merge master.

diff --git a/ChangeLog b/ChangeLog
index fce782d7a9f6a54b70488b0b59f29950440b9ef4..0d2b89a59f4a49813c5a23974035afc780535f93 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,17 @@
-2014-10-05  Carl Hetherington  <cth@carlh.net>
+2014-10-14  Carl Hetherington  <cth@carlh.net>
 
-       * Use a more sensible default position and size for
-       .srt subs.
+       * Version 1.74.3 released.
 
 2014-10-08  c.hetherington  <cth@carlh.net>
 
        * Make server finding more reliable when
        there are more than a few servers.
 
+2014-10-05  Carl Hetherington  <cth@carlh.net>
+
+       * Use a more sensible default position and size for
+       .srt subs.
+
 2014-10-03  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.14 released.

diff --git a/debian/changelog b/debian/changelog
index 67dbff2a4d0eeb010a69deb5c741570f948e1762..526cae29f07b089ed28a21be132cc2a5ee1f0b50 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -188,8 +188,9 @@ dcpomatic (2.0.14-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 003cc222f13ff400b1a64d4f4a06e112ee52a25a..c4a7fd5bca9f071b5da875d7a476d0c7d8ce2962 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"));