version = version,
license = 'GPLv2',
author = 'Catalin Marinas',
- author_email = 'catalin.marinas@gmail.org',
+ author_email = 'catalin.marinas@gmail.com',
url = 'http://www.procode.org/stgit/',
description = 'Stacked GIT',
long_description = 'Push/pop utility on top of GIT',
- scripts = ['stg', 'gitmergeonefile.py'],
+ scripts = ['stg'],
packages = ['stgit', 'stgit.commands'],
data_files = [('share/stgit/templates', glob.glob('templates/*.tmpl')),
('share/stgit/examples', glob.glob('examples/*.tmpl')),
- ('share/stgit/examples', ['examples/stgitrc'])]
+ ('share/stgit/examples', ['examples/gitconfig']),
+ ('share/stgit/contrib', ['contrib/diffcol.sh',
+ 'contrib/stgbashprompt.sh',
+ 'contrib/stgit-completion.bash']),
+ ('share/doc/stgit', glob.glob('doc/*.txt'))]
)