/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Jasper Groenewegen
  • Date: 2008-07-27 12:01:40 UTC
  • mfrom: (576.3.2 improve-merge)
  • mto: This revision was merged to the branch mainline in revision 579.
  • Revision ID: colbrac@xs4all.nl-20080727120140-1agdlzkc9fumjk5f
Merge merge dialog improvements

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
36
36
class InstallData(install_data):
37
37
    def run(self):
38
38
        self.data_files.extend(self._compile_po_files())
39
 
        # Disable for now - performance issues
40
 
        #self.data_files.extend(self._nautilus_plugin())
 
39
        self.data_files.extend(self._nautilus_plugin())
41
40
        install_data.run(self)
42
41
 
43
42
        try:
80
79
        files = []
81
80
        if sys.platform[:5] == 'linux':
82
81
            cmd = os.popen('pkg-config --variable=pythondir nautilus-python', 'r')
83
 
            res = cmd.readline()
 
82
            res = cmd.readline().strip()
84
83
            ret = cmd.close()
85
84
            
86
85
            if ret is None:
92
91
 
93
92
setup(
94
93
    name = "bzr-gtk",
95
 
    version = "0.94.0",
 
94
    version = "0.95.0",
96
95
    maintainer = "Jelmer Vernooij",
97
96
    maintainer_email = "jelmer@samba.org",
98
97
    description = "GTK+ Frontends for various Bazaar commands",
99
 
    license = "GNU GPL v2",
100
 
    scripts=['olive-gtk'],
 
98
    license = "GNU GPL v2 or later",
 
99
    scripts=['olive-gtk', 'bzr-handle-patch', 'bzr-notify'],
101
100
    package_dir = {
102
101
        "bzrlib.plugins.gtk": ".",
103
102
        "bzrlib.plugins.gtk.viz": "viz", 
105
104
        "bzrlib.plugins.gtk.olive": "olive",
106
105
        "bzrlib.plugins.gtk.tests": "tests",
107
106
        "bzrlib.plugins.gtk.branchview": "branchview",
 
107
        "bzrlib.plugins.gtk.preferences": "preferences",
108
108
        },
109
109
    packages = [
110
110
        "bzrlib.plugins.gtk",
113
113
        "bzrlib.plugins.gtk.olive",
114
114
        "bzrlib.plugins.gtk.tests",
115
115
        "bzrlib.plugins.gtk.branchview",
 
116
        "bzrlib.plugins.gtk.preferences",
116
117
        ],
117
 
    data_files=[('share/olive', ['olive.glade',
118
 
                                 'cmenu.ui',
 
118
    data_files=[('share/olive', ['cmenu.ui',
119
119
                                ]),
120
 
                ('share/olive/icons', ['icons/commit.png',
 
120
                ('share/bzr-gtk/icons', ['icons/commit.png',
121
121
                                 'icons/commit16.png',
122
122
                                 'icons/diff.png',
123
123
                                 'icons/diff16.png',
128
128
                                 'icons/push.png',
129
129
                                 'icons/push16.png',
130
130
                                 'icons/refresh.png',
131
 
                                 'icons/oliveicon2.png']),
 
131
                                 'icons/olive-gtk.png',
 
132
                                 'icons/oliveicon2.png',
 
133
                                 'icons/sign-bad.png',
 
134
                                 'icons/sign-ok.png',
 
135
                                 'icons/sign.png',
 
136
                                 'icons/sign-unknown.png',
 
137
                                 'icons/tag-16.png',
 
138
                                 'icons/bug.png',
 
139
                                 'icons/bzr-icon-64.png']),
132
140
                ('share/applications', ['olive-gtk.desktop',
133
141
                                        'bazaar-properties.desktop',
 
142
                                        'bzr-handle-patch.desktop',
134
143
                                        'bzr-notify.desktop']),
135
 
                ('share/pixmaps', ['icons/olive-gtk.png']),
 
144
                ('share/application-registry', ['bzr-gtk.applications']),
 
145
                ('share/pixmaps', ['icons/olive-gtk.png', 'icons/bzr-icon-64.png']),
136
146
                ('share/icons/hicolor/scalable/emblems', 
137
147
                    ['icons/emblem-bzr-added.svg', 
138
148
                        'icons/emblem-bzr-conflict.svg',