/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: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

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
 
 
42
        try:
 
43
            subprocess.check_call('gtk-update-icon-cache -f -t /usr/share/icons/hicolor')
 
44
        except:
 
45
            pass
 
46
 
43
47
    def _compile_po_files(self):
44
48
        data_files = []
45
49
        
87
91
 
88
92
setup(
89
93
    name = "bzr-gtk",
90
 
    version = "0.94.0",
 
94
    version = "0.95.0",
91
95
    maintainer = "Jelmer Vernooij",
92
96
    maintainer_email = "jelmer@samba.org",
93
97
    description = "GTK+ Frontends for various Bazaar commands",
94
 
    license = "GNU GPL v2",
 
98
    license = "GNU GPL v2 or later",
95
99
    scripts=['olive-gtk'],
96
100
    package_dir = {
97
101
        "bzrlib.plugins.gtk": ".",
98
102
        "bzrlib.plugins.gtk.viz": "viz", 
99
103
        "bzrlib.plugins.gtk.annotate": "annotate",
100
104
        "bzrlib.plugins.gtk.olive": "olive",
101
 
        "bzrlib.plugins.gtk.tests": "tests"
 
105
        "bzrlib.plugins.gtk.tests": "tests",
 
106
        "bzrlib.plugins.gtk.branchview": "branchview",
 
107
        "bzrlib.plugins.gtk.preferences": "preferences",
102
108
        },
103
109
    packages = [
104
 
        "olive",
105
110
        "bzrlib.plugins.gtk",
106
111
        "bzrlib.plugins.gtk.viz",
107
112
        "bzrlib.plugins.gtk.annotate",
108
113
        "bzrlib.plugins.gtk.olive",
109
 
        "bzrlib.plugins.gtk.tests"
 
114
        "bzrlib.plugins.gtk.tests",
 
115
        "bzrlib.plugins.gtk.branchview",
 
116
        "bzrlib.plugins.gtk.preferences",
110
117
        ],
111
118
    data_files=[('share/olive', ['olive.glade',
112
119
                                 'cmenu.ui',
123
130
                                 'icons/push16.png',
124
131
                                 'icons/refresh.png',
125
132
                                 'icons/oliveicon2.png']),
 
133
                ('share/bzr-gtk/icons', ['icons/sign-bad.png',
 
134
                                 'icons/sign-ok.png',
 
135
                                 'icons/sign.png',
 
136
                                 'icons/sign-unknown.png',
 
137
                                 'icons/bug.png',
 
138
                                 'icons/bzr-icon-64.png']),
126
139
                ('share/applications', ['olive-gtk.desktop',
127
140
                                        'bazaar-properties.desktop',
 
141
                                        'bzr-handle-patch.desktop',
128
142
                                        'bzr-notify.desktop']),
129
 
                ('share/pixmaps', ['icons/olive-gtk.png'])
 
143
                ('share/application-registry', ['bzr-gtk.applications']),
 
144
                ('share/pixmaps', ['icons/olive-gtk.png', 'icons/bzr-icon-64.png']),
 
145
                ('share/icons/hicolor/scalable/emblems', 
 
146
                    ['icons/emblem-bzr-added.svg', 
 
147
                        'icons/emblem-bzr-conflict.svg', 
 
148
                        'icons/emblem-bzr-controlled.svg', 
 
149
                        'icons/emblem-bzr-modified.svg',
 
150
                        'icons/emblem-bzr-removed.svg'])
130
151
               ],
131
152
    cmdclass={'install_data': InstallData,
132
153
              'check': Check}