projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9da1609
)
Don't need CDIST_LOCALE_PREFIX hack any more.
author
Carl Hetherington
<cth@carlh.net>
Tue, 25 Jun 2019 19:57:57 +0000
(20:57 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 27 Jun 2019 22:56:47 +0000
(23:56 +0100)
cscript
patch
|
blob
|
history
debian/rules
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index 6f1dd090309b7c12f8ad32814fa83455cac6f46d..d6426787f7d7ecc46230e52e9b9c7fd7ce47b698 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-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')
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')
target.command('dpkg-buildpackage -uc -us')
diff --git
a/debian/rules
b/debian/rules
index 2e266ada046609e96a9032df883c748f2a8e4d54..e58b8f7e195a0b583c591e69f3367fb3d024ffbf 100755
(executable)
--- 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/
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/
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/
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/
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/
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/
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/
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/
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:
.PHONY: override_dh_strip
override_dh_strip: