/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
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:
96
96
    maintainer_email = "jelmer@samba.org",
97
97
    description = "GTK+ Frontends for various Bazaar commands",
98
98
    license = "GNU GPL v2 or later",
99
 
    scripts=['olive-gtk', 'bzr-handle-patch', 'bzr-notify'],
 
99
    scripts=['olive-gtk'],
100
100
    package_dir = {
101
101
        "bzrlib.plugins.gtk": ".",
102
102
        "bzrlib.plugins.gtk.viz": "viz", 
115
115
        "bzrlib.plugins.gtk.branchview",
116
116
        "bzrlib.plugins.gtk.preferences",
117
117
        ],
118
 
    data_files=[('share/olive', ['cmenu.ui',
 
118
    data_files=[('share/olive', ['olive.glade',
 
119
                                 'cmenu.ui',
119
120
                                ]),
120
 
                ('share/bzr-gtk/icons', ['icons/commit.png',
 
121
                ('share/olive/icons', ['icons/commit.png',
121
122
                                 'icons/commit16.png',
122
123
                                 'icons/diff.png',
123
124
                                 'icons/diff16.png',
128
129
                                 'icons/push.png',
129
130
                                 'icons/push16.png',
130
131
                                 'icons/refresh.png',
131
 
                                 'icons/olive-gtk.png',
132
 
                                 'icons/oliveicon2.png',
133
 
                                 'icons/sign-bad.png',
 
132
                                 'icons/oliveicon2.png']),
 
133
                ('share/bzr-gtk/icons', ['icons/sign-bad.png',
134
134
                                 'icons/sign-ok.png',
135
135
                                 'icons/sign.png',
136
136
                                 'icons/sign-unknown.png',
137
 
                                 'icons/tag-16.png',
138
137
                                 'icons/bug.png',
139
138
                                 'icons/bzr-icon-64.png']),
140
139
                ('share/applications', ['olive-gtk.desktop',