Changeset View
Changeset View
Standalone View
Standalone View
devel/tortoisehg/files/patch-setup.py
| --- setup.py.orig 2016-11-03 15:31:44 UTC | --- setup.py.orig 2016-11-03 16:31:44.000000000 +0100 | ||||
| +++ setup.py | +++ setup.py 2017-01-20 20:29:41.807521000 +0100 | ||||
| @@ -452,7 +452,7 @@ class build(_build_orig): | @@ -452,7 +452,7 @@ | ||||
| lambda self: 'py2app' in self.distribution.commands), | lambda self: 'py2app' in self.distribution.commands), | ||||
| ('build_ui', None), | ('build_ui', None), | ||||
| ('build_qrc', lambda self: 'py2exe' in self.distribution.commands), | ('build_qrc', lambda self: 'py2exe' in self.distribution.commands), | ||||
| - ('build_mo', None), | - ('build_mo', None), | ||||
| +%%NLS%% ('build_mo', None), | +%%NLS%% ('build_mo', None), | ||||
| ] + _build_orig.sub_commands | ] + _build_orig.sub_commands | ||||
| class clean(_clean_orig): | class clean(_clean_orig): | ||||
| @@ -666,10 +666,10 @@ def setup_posix(): | @@ -658,7 +658,7 @@ | ||||
| # Specific definitios for Posix installations | |||||
| _extra = {} | |||||
| _scripts = ['thg'] | |||||
| - _packages = ['tortoisehg', 'tortoisehg.hgqt', 'tortoisehg.util', 'hgext3rd'] | |||||
| + _packages = ['tortoisehg', 'tortoisehg.hgqt', 'tortoisehg.util'] | |||||
| _data_files = [] | |||||
| # .svg and .png are loaded by thg, .ico by nautilus extension | |||||
| for root, dirs, files in os.walk('icons'): | |||||
| @@ -666,10 +666,10 @@ | |||||
| dirs.remove('svg') # drop source of .ico files | dirs.remove('svg') # drop source of .ico files | ||||
| _data_files.append((os.path.join('share/pixmaps/tortoisehg', root), | _data_files.append((os.path.join('share/pixmaps/tortoisehg', root), | ||||
| [os.path.join(root, f) for f in files])) | [os.path.join(root, f) for f in files])) | ||||
| - _data_files.extend((os.path.join('share', modir), [mofile]) | - _data_files.extend((os.path.join('share', modir), [mofile]) | ||||
| - for pofile, modir, mofile in _walklocales()) | - for pofile, modir, mofile in _walklocales()) | ||||
| - _data_files += [('share/nautilus-python/extensions', | - _data_files += [('share/nautilus-python/extensions', | ||||
| - ['contrib/nautilus-thg.py'])] | - ['contrib/nautilus-thg.py'])] | ||||
| +%%NLS%% _data_files.extend((os.path.join('share', modir), [mofile]) | +%%NLS%% _data_files.extend((os.path.join('share', modir), [mofile]) | ||||
| +%%NLS%% for pofile, modir, mofile in _walklocales()) | +%%NLS%% for pofile, modir, mofile in _walklocales()) | ||||
| +%%NAUTILUS%% _data_files += [('share/nautilus-python/extensions', | +%%NAUTILUS%% _data_files += [('share/nautilus-python/extensions', | ||||
| +%%NAUTILUS%% ['contrib/nautilus-thg.py'])] | +%%NAUTILUS%% ['contrib/nautilus-thg.py'])] | ||||
| return _scripts, _packages, _data_files, _extra | return _scripts, _packages, _data_files, _extra | ||||