Rev 478: Merge Chris' preferences installation fix. in file:///data/jelmer/bzr-gtk/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-gtk/trunk/

------------------------------------------------------------
revno: 478
revision-id: jelmer at samba.org-20080501131258-kf7xsk1znq5zk1je
parent: jelmer at samba.org-20080501131123-d6z8r9uujyn2ahv2
parent: jelmer at samba.org-20080501130354-jmdltge9a07tydwl
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Thu 2008-05-01 15:12:58 +0200
message:
  Merge Chris' preferences installation fix.
modified:
  setup.py                       setup.py-20060716162505-h2isrtlg8lmlg2o2-1
    ------------------------------------------------------------
    revno: 476.1.1
    revision-id: jelmer at samba.org-20080501130354-jmdltge9a07tydwl
    parent: jelmer at samba.org-20080430130830-i1y4ytmi5ov6km4f
    author: Chris Lamb <chris at chris-lamb.co.uk>
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: fix-preferences-install
    timestamp: Thu 2008-05-01 15:03:54 +0200
    message:
      Build and install the bzrlib.plugins.gtk.preferences package
    modified:
      setup.py                       setup.py-20060716162505-h2isrtlg8lmlg2o2-1
=== modified file 'setup.py'
--- a/setup.py	2008-04-25 21:38:41 +0000
+++ b/setup.py	2008-05-01 13:03:54 +0000
@@ -104,6 +104,7 @@
         "bzrlib.plugins.gtk.olive": "olive",
         "bzrlib.plugins.gtk.tests": "tests",
         "bzrlib.plugins.gtk.branchview": "branchview",
+        "bzrlib.plugins.gtk.preferences": "preferences",
         },
     packages = [
         "bzrlib.plugins.gtk",
@@ -112,6 +113,7 @@
         "bzrlib.plugins.gtk.olive",
         "bzrlib.plugins.gtk.tests",
         "bzrlib.plugins.gtk.branchview",
+        "bzrlib.plugins.gtk.preferences",
         ],
     data_files=[('share/olive', ['olive.glade',
                                  'cmenu.ui',