/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: Adrian Wilkins
  • Date: 2008-04-24 15:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places. 

This removes a huge shower of stack traces that get dumped to console when 
you look at the bottom of a log.

Show diffs side-by-side

added added

removed removed

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