diff --git a/debian_me/rules b/debian_me/rules index 125949d2..8eb72a11 100755 --- a/debian_me/rules +++ b/debian_me/rules @@ -44,6 +44,7 @@ install: build chmod +x src/run.py cp -R src/ $(CURDIR)/debian/dupeguru-me/usr/share/dupeguru_me cp $(CURDIR)/debian/dupeguru_me.desktop $(CURDIR)/debian/dupeguru-me/usr/share/applications + mkdir $(CURDIR)/debian/dupeguru-me/usr/bin ln -s /usr/share/dupeguru_me/run.py $(CURDIR)/debian/dupeguru-me/usr/bin/dupeguru_me diff --git a/debian_pe/rules b/debian_pe/rules index 4e0b6a48..b823d902 100755 --- a/debian_pe/rules +++ b/debian_pe/rules @@ -44,6 +44,7 @@ install: build chmod +x src/run.py cp -R src/ $(CURDIR)/debian/dupeguru-pe/usr/share/dupeguru_pe cp $(CURDIR)/debian/dupeguru_pe.desktop $(CURDIR)/debian/dupeguru-pe/usr/share/applications + mkdir $(CURDIR)/debian/dupeguru-pe/usr/bin ln -s /usr/share/dupeguru_pe/run.py $(CURDIR)/debian/dupeguru-pe/usr/bin/dupeguru_pe diff --git a/debian_se/rules b/debian_se/rules index c6a5c7b5..c71d3f3c 100755 --- a/debian_se/rules +++ b/debian_se/rules @@ -44,6 +44,7 @@ install: build chmod +x src/run.py cp -R src/ $(CURDIR)/debian/dupeguru-se/usr/share/dupeguru_se cp $(CURDIR)/debian/dupeguru_se.desktop $(CURDIR)/debian/dupeguru-se/usr/share/applications + mkdir $(CURDIR)/debian/dupeguru-se/usr/bin ln -s /usr/share/dupeguru_se/run.py $(CURDIR)/debian/dupeguru-se/usr/bin/dupeguru_se diff --git a/package.py b/package.py index 8f88cdc6..d71ca4fd 100644 --- a/package.py +++ b/package.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Created By: Virgil Dupras # Created On: 2009-12-30 # Copyright 2011 Hardcoded Software (http://www.hardcoded.net) @@ -101,6 +100,7 @@ def package_debian(edition): from_version = {'se': '2.9.2', 'me': '5.7.2', 'pe': '1.8.5'}[edition] build_debian_changelog(changelogpath, changelog_dest, project_name, from_version=from_version) shutil.copytree(op.join('build', 'help'), op.join(srcpath, 'help')) + shutil.copytree(op.join('build', 'locale'), op.join(srcpath, 'locale')) shutil.copy(op.join('images', ed('dg{0}_logo_128.png')), srcpath) compileall.compile_dir(srcpath) os.chdir(destpath) diff --git a/run_template_qt.py b/run_template_qt.py index b40e1956..5d417bf4 100644 --- a/run_template_qt.py +++ b/run_template_qt.py @@ -17,6 +17,7 @@ from hscommon.plat import ISWINDOWS from hscommon.trans import install_gettext_trans_under_qt from qtlib.error_report_dialog import install_excepthook from qt.base import dg_rc +from qt.base.platform import BASE_PATH from core_{{edition}} import __version__, __appname__ if ISWINDOWS: @@ -29,11 +30,7 @@ if __name__ == "__main__": QCoreApplication.setApplicationVersion(__version__) settings = QSettings() lang = settings.value('Language').toString() - try: - locale_folder = op.join(op.dirname(__file__), 'locale') - except NameError: - # We're in a freezed environment (no __file__) - locale_folder = 'locale' + locale_folder = op.join(BASE_PATH, 'locale') install_gettext_trans_under_qt(locale_folder, lang) # Many strings are translated at import time, so this is why we only import after the translator # has been installed