diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-06-25 20:57:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-06-27 23:56:47 +0100 |
| commit | 40b49db0a6e88ac640cd897456bd357cc96f2c28 (patch) | |
| tree | d57f384f756dd038bdea812c01755321c08ba445 | |
| parent | 9da16092c7add153759c1ebf035533a420567c1d (diff) | |
Don't need CDIST_LOCALE_PREFIX hack any more.
| -rw-r--r-- | cscript | 4 | ||||
| -rwxr-xr-x | debian/rules | 16 |
2 files changed, 8 insertions, 12 deletions
@@ -554,10 +554,6 @@ def package_debian(target, cpu, version, options): target.set('CDIST_CONFIGURE', '"' + configure_options(target, options) + '"') if target.debug: target.set('CDIST_DEBUG_PACKAGE', '--dbg-package=dcpomatic-dbg') - if target.version in ['7', '14.04']: - target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') - else: - target.set('CDIST_LOCALE_PREFIX', '/usr/share/locale') target.command('dpkg-buildpackage -uc -us') diff --git a/debian/rules b/debian/rules index 2e266ada0..e58b8f7e1 100755 --- a/debian/rules +++ b/debian/rules @@ -22,21 +22,21 @@ override_dh_auto_build: override_dh_auto_install: ./waf install --destdir=debian/dcpomatic mkdir -p debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/ - cp -a $(CDIST_LOCALE_PREFIX)/de/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/de/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/de/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/ - cp -a $(CDIST_LOCALE_PREFIX)/es/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/es/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/es/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/ - cp -a $(CDIST_LOCALE_PREFIX)/fr/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/fr/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/fr/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/ - cp -a $(CDIST_LOCALE_PREFIX)/it/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/it/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/it/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/ - cp -a $(CDIST_LOCALE_PREFIX)/sv/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/sv/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/sv/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/ - cp -a $(CDIST_LOCALE_PREFIX)/nl/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/nl/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/nl/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/dcpomatic/usr/share/locale/pl/LC_MESSAGES/ - cp -a $(CDIST_LOCALE_PREFIX)/pl/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/pl/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/pl/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/pl/LC_MESSAGES/dcpomatic2-wxstd.mo mkdir -p debian/dcpomatic/usr/share/locale/ru/LC_MESSAGES/ - cp -a $(CDIST_LOCALE_PREFIX)/ru/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo + cp -a /usr/share/ru/LC_MESSAGES/wxstd.mo debian/dcpomatic/usr/share/locale/ru/LC_MESSAGES/dcpomatic2-wxstd.mo .PHONY: override_dh_strip override_dh_strip: |