diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-10-15 09:34:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-10-15 09:34:46 +0100 |
| commit | e491397c0028a80ac4a48a92007f783746553c1a (patch) | |
| tree | 6cfabf78852e968323a1855c650b3b9c739b5334 | |
| parent | 12efbd5938f08eb445b43f539fa4f27aa5caccfb (diff) | |
| parent | 60febebc55d25b5f60297d9f8c1b51fbda6bac63 (diff) | |
Merge master.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | debian/rules | 12 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 8 |
4 files changed, 29 insertions, 4 deletions
@@ -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 67dbff2a4..526cae29f 100644 --- 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 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 003cc222f..c4a7fd5bc 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")); |