[Pkg-bazaar-commits] ./bzr-gtk/unstable r568: Merge fixes to setup.py by Daniel Schömer

[Jasper Groenewegen]

------------------------------------------------------------
revno: 568
committer: Jasper Groenewegen <colbrac at xs4all.nl>
branch nick: trunk
timestamp: Wed 2008-07-23 12:38:20 +0200
message:
  Merge fixes to setup.py by Daniel Schömer
modified:
  setup.py
    ------------------------------------------------------------
    revno: 560.7.1
    committer: Daniel Schömer <daniel.schoemer at gmx.net>
    branch nick: bzr-gtk
    timestamp: Mon 2008-07-21 20:07:34 +0200
    message:
      Strip newline from nautilus-python pythondir read from pkg-config.
    modified:
      setup.py
    ------------------------------------------------------------
    revno: 560.8.1
    committer: Daniel Schömer <daniel.schoemer at gmx.net>
    branch nick: bzr-gtk
    timestamp: Mon 2008-07-21 20:18:49 +0200
    message:
      Missing comma in data_files list.
    modified:
      setup.py
-------------- next part --------------
=== modified file 'setup.py'
--- a/setup.py	2008-07-20 17:53:24 +0000
+++ b/setup.py	2008-07-23 10:38:20 +0000
@@ -79,7 +79,7 @@
         files = []
         if sys.platform[:5] == 'linux':
             cmd = os.popen('pkg-config --variable=pythondir nautilus-python', 'r')
-            res = cmd.readline()
+            res = cmd.readline().strip()
             ret = cmd.close()
             
             if ret is None:
@@ -133,7 +133,7 @@
                                  'icons/sign-ok.png',
                                  'icons/sign.png',
                                  'icons/sign-unknown.png',
-                                 'icons/tag-16.png'
+                                 'icons/tag-16.png',
                                  'icons/bug.png',
                                  'icons/bzr-icon-64.png']),
                 ('share/applications', ['olive-gtk.desktop',