Update bonobo to 0.37.

Changes include:

Bonobo 0.37

        * Fix Bonobo Zoomable (Michael Engber)

        * Documentation fixage (John Sheets)

        * Any serialization xml supports aliases (Dietmar)

        * Listener / Event Source fixes (Dan Winship)

        * Bonobo Control fixage (Dan Winship)

        * UI str compare fixage (Darin Adler)

        * Cleanup config dialog (Cody Russell)

        * Publicised XObject type & bits (Me)

Bonobo 0.36

        * Convert print to BonoboXObject (Me) - forgot it.

        * Fix flicker issue (Me)

        * Remove bonobo-idl (Me)

        * Use nice type creation macro (Dietmar)

        * Toolbar control leak fix (Maciej)

Bonobo 0.35

        * BonoboXObject (Me)

        * Canvas fixes (Mike Kestner)
                * IDL cleanups
                * Misc bug fixage

        * UI handler
                * Toolbar shadow preference fix (Federico Mena)
                * Toolbar sizing problems (Ettore)
                * Builtin toolbar customization GUI & popup (Me)
                * UI configuration code (Me)
                * UI Menu rebuild acceleration (Me)
                * UI config Leak fixes (Iain)
                * Toolbar resize bug (Cody Russell)
                * Tearoff menu fixage (Me, Darin Adler)

        * Monikers
                * comparison method (Me)
                * stream cache moniker (Dietmar)

        * Misc new features
                * Use a Stream to transfer print data (Me)
                * Re-namespace IDL files (Me)
                * Property bag fixage (Dietmar)
                * Automatic shlib reference tracking (Dietmar)
                * Profiling config support (Pavel Cisler)
                * Zoomable interface expansion (Cody Russell)

        * Misc bug fixing
                * Leak fixes (Morten, Me)
                * Method chaining bugs (Me)
                * Depend on oaf >= 0.6.2 (Me)
                * LibIDL checks for bonobo-idl (Me)
                * Fix bonobo-idl build (Me)
                * function signature fix (George Lebl)
                * Stream moniker extender fix (Lutz Muller)
                * Calm ORBit warnings (Maciej Stachowiak)

        * Reference counting problems nailed (Owen, Me)

        * Begginings of keyboard focus fixage (Federico)

Bonobo 0.33

        * Fixed broken standard moniker id (Me)

        * Fix UI verb tracking leak (Me)

        * Fix old UI race condition (Me)

Bonobo 0.32

        * Monikers
                * Virtualized more of BonoboMoniker (Me)
                * Item container re-written (Me)
                * Item handler implemented (Miguel)

        * UI stuff (Me)
                * Substantialy re-factored
                * Acceleration (with Pavel)
                * Configuration engine
                * Toolbar customization dialog
                * Ignore Gtk+ keybinding assignment
                * Hide lots of internals
                * Docs updated
                * honour more GNOME prefs (Jacob)

        * Property Bag (Dietmar)
                * Improved exception handling
                * Reference leaks fixed
                * new Property listener methods
                * Property is an Unknown

        * Canvas Items (Mike Kestner)
                * Add event signal
                * Add grab / ungrab
                * Fix UI merging code
                * Update proxy creation

        * Fixed reference handling on addInterface (Dietmar)

        * Event Source updated (Dietmar)

        * Several reference leaks nailed (Dietmar)

        * Improved running context ref tracking (Dietmar)

        * Macros to reduce code complexity (Dietmar)

        * Header include cleanups (Jason Leach)

        * Conversion to xml-i18n-tools (Maciej)

        * Misc. bugs fixed (Darin, Eskil Olsen, Robin Slomkowski)

Bonobo 0.31

        * Serious bugs fixed
                * Depend on ORBit-0.5.6
                * Re-include Federico's Policy leak fixes.
                * Fix fatal toolbar icon bug (DanW)
                * memset fixes (George Lebl)

        * Monikers
                Drastic simplification of Moniker API (Me)
                Std monikers merged to shlib (Dietmar)
                Moniker extenders implemented (Dietmar, Me)
                Misc. fixes (Miguel)
                Parsing tests added (Me)
                Simplify interface naming on resolve (Me)

        * Property bag
                Listening re-written using EventSource (Dietmar)
                Use our own ID scheme to identity listeners (Dietmar)
                Allow sub-classing (George Lebl)

        * Running context to track references implemented (Me)

        * Useful cleanups
                * API documentation (Miguel, Me)
                * Make generic-factory sub-classable (Me)
                * Make the component selector control useful (Me)
                * Implement a shlib factory to handle module unloading (Me)
                * UI methods on Canvas embeddables (Me)
                * VFS storage fixes (Lutz Muller)
                * Persist fixes (Gergo Erdi)
                * Make bonobo-transient sub-classable (George Lebl)

        * Build & misc. bug fixes (Arturo Tena, Richard Hult, Dave Camp
                                   Daniel Egger, Maciej Stachowiak)


Bonobo 0.30

        * Released since Elliot would not produce a fixed ORBit release,
        reverts fixes in 0.29, should not pass distcheck.

Bonobo 0.29

        * Evil bugs
                * X / CORBA synchronisation issues fixed (Me)
                * Property bag / transient memory leaks fixed (Federico)
                * Toolbar widget leak (Darin Alder)
                * Lots of misc leaks nailed (Morten)
                * Bonobo plug / socket race condition nailed (Me)

        * Storage stuff
                * Local FS Stream / Storage impl. completed (Dietmar)
                * Efs stream / storage polished up (Dietmar)
                * VFS storage cleans (Me)
                * Bonobo IO plugins version fixage (Dietmar)
                * Storage module cleans, and regression testing (Dietmar)

        * Monikers
                * Bonobo widget switched to use monikers (Me)
                * Bonobo contexts - moniker context (Me)
                * tar moniker (Vladimir Vukicevic)
                * http, gunzip monikers (Joe Shaw)
                * moniker test code (Joe Shaw)
                * Asynchronous moniker resolution (Me)

        * New transient CORBA object helper (Miguel)

        * UI stuff
                * Alpha composited icons (for pixmap themes) (Cody Russell)
                * Control desired size querying (Martin)
                * Completed toolbar item 'look' markup (John Sullivan)
                * pixmap location code flexed (Martin)
                * placeholder can hide all its contents (Darin)
                * UI signaling race conditions nailed (Darin, Me)
                * Helpers for removing dead UI components (Maciej)

        * Misc
                * CORBA_any * <-> XML serialization (Me)
                * generic listener / event interface re-written (Alex Graveley)
                * Created component selector control (Me)
                * listener fixes (Iain Holmes)
                * BonoboPropertyControl implemented & honed (Iain)
                * Make each IDL file parse individualy (Mathieu Lacage)

        * Embeddable factory bug flattened (Mike Kestner)

        * Docs
                * API build cleanups (Zach Frey)
                * Lots of API doc writing / organising (Miguel)
                * doc/NAMESPACE added to start namespacing IDL (Me)

        * Lots of bugs fixed.

5 files changed, 155 insertions, 55 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 7a3587a47ed..873ac05c428 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2001/03/27 03:19:50 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/04/06 22:16:49 rh Exp $
 #
 
-DISTNAME=		bonobo-0.30
+DISTNAME=		bonobo-0.37
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=unstable/sources/bonobo/}
 
@@ -10,11 +10,11 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Architecture for creating reusable software components
 
 BUILD_DEPENDS+=		bison-*:../../devel/bison
-DEPENDS+=		ORBit>=0.5.6:../../net/ORBit
-DEPENDS+=		gdk-pixbuf>=0.6.0:../../graphics/gdk-pixbuf
-DEPENDS+=		oaf>=0.6.1:../../devel/oaf
-DEPENDS+=		gnome-libs>=1.2.7:../../x11/gnome-libs
-DEPENDS+=		gnome-print>=0.25:../../print/gnome-print
+DEPENDS+=		ORBit>=0.5.7:../../net/ORBit
+DEPENDS+=		gdk-pixbuf-gnome>=0.10.0:../../graphics/gdk-pixbuf-gnome
+DEPENDS+=		oaf>=0.6.5:../../devel/oaf
+DEPENDS+=		gnome-libs>=1.2.13:../../x11/gnome-libs
+DEPENDS+=		gnome-print>=0.28:../../print/gnome-print
 
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
diff --git a/devel/bonobo/files/md5 b/devel/bonobo/files/md5
index acee26d66a2..a9e48fed0d1 100644
--- a/devel/bonobo/files/md5
+++ b/devel/bonobo/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 2000/12/31 14:01:44 rh Exp $
+$NetBSD: md5,v 1.6 2001/04/06 22:16:50 rh Exp $
 
-MD5 (bonobo-0.30.tar.gz) = 640d6b3285044ee7e9a1462dfe13a874
+SHA1 (bonobo-0.37.tar.gz) = 27869178a61bdf37c40c81913c6420ee108d891b
diff --git a/devel/bonobo/files/patch-sum b/devel/bonobo/files/patch-sum
index 6efbee1fd05..6d8498bb588 100644
--- a/devel/bonobo/files/patch-sum
+++ b/devel/bonobo/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/08/29 16:28:41 rh Exp $
+$NetBSD: patch-sum,v 1.5 2001/04/06 22:16:50 rh Exp $
 
-MD5 (patch-aa) = 2525a0a0958aa990f16f63c90932f01c
-MD5 (patch-ab) = f41238bcaeaa1d2291c503469b5a110d
+SHA1 (patch-aa) = abb08c79e9971e755f4fef72bce46a88e9299397
+SHA1 (patch-ab) = bf5a5aae979ce382d70e2b5e9ff98ccd6ff9d150
diff --git a/devel/bonobo/patches/patch-ab b/devel/bonobo/patches/patch-ab
index 5302900ed3a..fe39df84451 100644
--- a/devel/bonobo/patches/patch-ab
+++ b/devel/bonobo/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2000/08/29 16:28:41 rh Exp $
+$NetBSD: patch-ab,v 1.4 2001/04/06 22:16:50 rh Exp $
 
---- configure.orig	Tue Aug 29 17:49:52 2000
+--- configure.orig	Thu Feb 15 07:40:11 2001
 +++ configure
-@@ -4263,7 +4263,7 @@
+@@ -4353,7 +4353,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -11,3 +11,14 @@ $NetBSD: patch-ab,v 1.3 2000/08/29 16:28:41 rh Exp $
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
+@@ -6309,6 +6309,10 @@
+ bonobo/Makefile
+ storage-modules/Makefile
+ monikers/Makefile
++monikers/Bonobo_Moniker_gzip.oaf
++monikers/Bonobo_Moniker_http.oaf
++monikers/Bonobo_Moniker_std.oaf.in
++monikers/Bonobo_Moniker_std.oaf
+ components/Makefile
+ components/application-x-gnomine/Makefile
+ components/text-plain/Makefile
diff --git a/devel/bonobo/pkg/PLIST b/devel/bonobo/pkg/PLIST
index 78889da4673..28419fc04f0 100644
--- a/devel/bonobo/pkg/PLIST
+++ b/devel/bonobo/pkg/PLIST
@@ -1,22 +1,22 @@
-@comment $NetBSD: PLIST,v 1.8 2001/01/04 15:10:26 agc Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/04/06 22:16:50 rh Exp $
 bin/bonobo-application-x-mines
 bin/bonobo-audio-ulaw
 bin/bonobo-echo
-bin/bonobo-hello
 bin/bonobo-moniker-gunzip
 bin/bonobo-moniker-http
+bin/bonobo-sample-canvas-item
+bin/bonobo-sample-controls
+bin/bonobo-sample-hello
+bin/bonobo-sample-paint
 bin/bonobo-selector
 bin/bonobo-text-plain
 bin/echo-client
 bin/efstool
 bin/gshell
 bin/libefs-config
-bin/paint-component-simple
-bin/sample-canvas-item
+bin/moniker-test
 bin/sample-container
 bin/sample-control-container
-bin/sample-control-factory
-bin/std-moniker
 include/bonobo.h
 include/bonobo/Bonobo.h
 include/bonobo/bonobo-arg.h
@@ -37,6 +37,8 @@ include/bonobo/bonobo-item-container.h
 include/bonobo/bonobo-item-handler.h
 include/bonobo/bonobo-listener.h
 include/bonobo/bonobo-main.h
+include/bonobo/bonobo-moniker-extender.h
+include/bonobo/bonobo-moniker-simple.h
 include/bonobo/bonobo-moniker-util.h
 include/bonobo/bonobo-moniker.h
 include/bonobo/bonobo-object-client.h
@@ -54,12 +56,11 @@ include/bonobo/bonobo-property-bag-client.h
 include/bonobo/bonobo-property-bag.h
 include/bonobo/bonobo-property-bag-xml.h
 include/bonobo/bonobo-property-control.h
-include/bonobo/bonobo-property-listener.h
-include/bonobo/bonobo-property-types.h
 include/bonobo/bonobo-property.h
 include/bonobo/bonobo-selector.h
 include/bonobo/bonobo-selector-widget.h
 include/bonobo/bonobo-socket.h
+include/bonobo/bonobo-shlib-factory.h
 include/bonobo/bonobo-storage.h
 include/bonobo/bonobo-storage-plugin.h
 include/bonobo/bonobo-stream-client.h
@@ -67,19 +68,22 @@ include/bonobo/bonobo-stream-memory.h
 include/bonobo/bonobo-stream.h
 include/bonobo/bonobo-transient.h
 include/bonobo/bonobo-ui-component.h
+include/bonobo/bonobo-ui-config-widget.h
 include/bonobo/bonobo-ui-container.h
+include/bonobo/bonobo-ui-engine.h
 include/bonobo/bonobo-ui-node.h
+include/bonobo/bonobo-ui-sync.h
 include/bonobo/bonobo-ui-toolbar-button-item.h
 include/bonobo/bonobo-ui-toolbar-icon.h
 include/bonobo/bonobo-ui-toolbar-item.h
 include/bonobo/bonobo-ui-toolbar-toggle-button-item.h
 include/bonobo/bonobo-ui-util.h
-include/bonobo/bonobo-ui-xml.h
 include/bonobo/bonobo-view-frame.h
 include/bonobo/bonobo-view.h
 include/bonobo/bonobo-widget.h
 include/bonobo/bonobo-win.h
 include/bonobo/bonobo-wrapper.h
+include/bonobo/bonobo-xobject.h
 include/bonobo/bonobo-zoomable-frame.h
 include/bonobo/bonobo-zoomable.h
 include/efs.h
@@ -93,6 +97,11 @@ lib/bonobo/plugin/libstorage_efs.so
 lib/bonobo/plugin/libstorage_fs.la
 lib/bonobo/plugin/libstorage_fs.a
 lib/bonobo/plugin/libstorage_fs.so
+lib/bonobo/monikers/libmoniker_std.a
+lib/bonobo/monikers/libmoniker_std.la
+lib/bonobo/monikers/libmoniker_std.so.0.0
+lib/bonobo/monikers/libmoniker_std.so.0
+lib/bonobo/monikers/libmoniker_std.so
 lib/libbonobo-print.la
 lib/libbonobo-print.a
 lib/libbonobo-print.so
@@ -114,33 +123,112 @@ lib/libefs.so
 lib/libefs.so.1
 lib/libefs.so.1.0
 lib/pkgconfig/libefs.pc
+share/bonobo/html/bonobo-api.html
 share/bonobo/html/bonobo-api.sgml
 share/bonobo/html/bonobo-decl.txt
 share/bonobo/html/bonobo-sections.txt
 share/bonobo/html/bonobo.hierarchy
 share/bonobo/html/bonobo.signals
 share/bonobo/html/bonobo.types
+share/bonobo/html/bonobo/bonobo-bonobo-activation-context.html
+share/bonobo/html/bonobo/bonobo-bonobo-arg.html
+share/bonobo/html/bonobo/bonobo-bonobo-canvas-component.html
+share/bonobo/html/bonobo/bonobo-bonobo-canvas-item.html
+share/bonobo/html/bonobo/bonobo-bonobo-client-site.html
+share/bonobo/html/bonobo/bonobo-bonobo-component-io.html
+share/bonobo/html/bonobo/bonobo-bonobo-context.html
+share/bonobo/html/bonobo/bonobo-bonobo-control-frame.html
+share/bonobo/html/bonobo/bonobo-bonobo-control.html
+share/bonobo/html/bonobo/bonobo-bonobo-desktop-window.html
+share/bonobo/html/bonobo/bonobo-bonobo-embeddable.html
+share/bonobo/html/bonobo/bonobo-bonobo-event-source.html
+share/bonobo/html/bonobo/bonobo-bonobo-exception.html
+share/bonobo/html/bonobo/bonobo-bonobo-generic-factory.html
+share/bonobo/html/bonobo/bonobo-bonobo-item-container.html
+share/bonobo/html/bonobo/bonobo-bonobo-item-handler.html
+share/bonobo/html/bonobo/bonobo-bonobo-listener.html
+share/bonobo/html/bonobo/bonobo-bonobo-main.html
+share/bonobo/html/bonobo/bonobo-bonobo-moniker-async.html
+share/bonobo/html/bonobo/bonobo-bonobo-moniker-util.html
+share/bonobo/html/bonobo/bonobo-bonobo-moniker.html
+share/bonobo/html/bonobo/bonobo-bonobo-object-client.html
+share/bonobo/html/bonobo/bonobo-bonobo-object-directory.html
+share/bonobo/html/bonobo/bonobo-bonobo-object-io.html
+share/bonobo/html/bonobo/bonobo-bonobo-object.html
+share/bonobo/html/bonobo/bonobo-bonobo-persist-file.html
+share/bonobo/html/bonobo/bonobo-bonobo-persist-stream.html
+share/bonobo/html/bonobo/bonobo-bonobo-persist.html
+share/bonobo/html/bonobo/bonobo-bonobo-plug.html
+share/bonobo/html/bonobo/bonobo-bonobo-print-client.html
+share/bonobo/html/bonobo/bonobo-bonobo-print.html
+share/bonobo/html/bonobo/bonobo-bonobo-progressive.html
+share/bonobo/html/bonobo/bonobo-bonobo-property-bag-client.html
+share/bonobo/html/bonobo/bonobo-bonobo-property-bag-xml.html
+share/bonobo/html/bonobo/bonobo-bonobo-property-bag.html
+share/bonobo/html/bonobo/bonobo-bonobo-property-control.html
+share/bonobo/html/bonobo/bonobo-bonobo-property-listener.html
+share/bonobo/html/bonobo/bonobo-bonobo-property-types.html
+share/bonobo/html/bonobo/bonobo-bonobo-property.html
+share/bonobo/html/bonobo/bonobo-bonobo-selector.html
+share/bonobo/html/bonobo/bonobo-bonobo-socket.html
+share/bonobo/html/bonobo/bonobo-bonobo-storage-plugin.html
+share/bonobo/html/bonobo/bonobo-bonobo-storage.html
+share/bonobo/html/bonobo/bonobo-bonobo-stream-client.html
+share/bonobo/html/bonobo/bonobo-bonobo-stream-memory.html
+share/bonobo/html/bonobo/bonobo-bonobo-stream.html
+share/bonobo/html/bonobo/bonobo-bonobo-transient.html
+share/bonobo/html/bonobo/bonobo-bonobo-ui-component.html
+share/bonobo/html/bonobo/bonobo-bonobo-ui-container.html
+share/bonobo/html/bonobo/bonobo-bonobo-ui-node.html
+share/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-button-item.html
+share/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-icon.html
+share/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-item.html
+share/bonobo/html/bonobo/bonobo-bonobo-ui-toolbar-toggle-button-item.html
+share/bonobo/html/bonobo/bonobo-bonobo-ui-util.html
+share/bonobo/html/bonobo/bonobo-bonobo-ui-xml.html
+share/bonobo/html/bonobo/bonobo-bonobo-view-frame.html
+share/bonobo/html/bonobo/bonobo-bonobo-view.html
+share/bonobo/html/bonobo/bonobo-bonobo-widget.html
+share/bonobo/html/bonobo/bonobo-bonobo-win.html
+share/bonobo/html/bonobo/bonobo-bonobo-wrapper.html
+share/bonobo/html/bonobo/bonobo-bonobo-zoomable-frame.html
+share/bonobo/html/bonobo/bonobo-bonobo-zoomable.html
+share/bonobo/html/bonobo/bonobo-core.html
+share/bonobo/html/bonobo/bonobo-documents-widgets.html
+share/bonobo/html/bonobo/bonobo-moniker-handlers.html
+share/bonobo/html/bonobo/bonobo-notification.html
+share/bonobo/html/bonobo/bonobo-object-activation.html
+share/bonobo/html/bonobo/bonobo-print.html
+share/bonobo/html/bonobo/bonobo-properties.html
+share/bonobo/html/bonobo/bonobo-storage.html
+share/bonobo/html/bonobo/bonobo-support-utilities.html
+share/bonobo/html/bonobo/bonobo-ui.html
+share/bonobo/html/bonobo/book1.html
+share/bonobo/html/bonobo/x11340.html
+share/bonobo/html/bonobo/x11347.html
 share/gnome/ui/gshell-ui.xml
 share/idl/Bonobo.idl
-share/idl/Echo.idl
-share/idl/bonobo-advise.idl
-share/idl/bonobo-canvas.idl
-share/idl/bonobo-client-site.idl
-share/idl/bonobo-context.idl
-share/idl/bonobo-control.idl
-share/idl/bonobo-desktop.idl
-share/idl/bonobo-embeddable.idl
-share/idl/bonobo-item-container.idl
-share/idl/bonobo-listener.idl
-share/idl/bonobo-moniker.idl
-share/idl/bonobo-persist.idl
-share/idl/bonobo-print.idl
-share/idl/bonobo-progressive.idl
-share/idl/bonobo-property.idl
-share/idl/bonobo-storage.idl
-share/idl/bonobo-ui.idl
-share/idl/bonobo-unknown.idl
-share/idl/bonobo-zoomable.idl
+share/idl/Bonobo_Advise.idl
+share/idl/Bonobo_Canvas.idl
+share/idl/Bonobo_ClientSite.idl
+share/idl/Bonobo_Context.idl
+share/idl/Bonobo_Control.idl
+share/idl/Bonobo_Desktop.idl
+share/idl/Bonobo_Embeddable.idl
+share/idl/Bonobo_Exception.idl
+share/idl/Bonobo_ItemContainer.idl
+share/idl/Bonobo_Listener.idl
+share/idl/Bonobo_Moniker.idl
+share/idl/Bonobo_Persist.idl
+share/idl/Bonobo_Print.idl
+share/idl/Bonobo_Progressive.idl
+share/idl/Bonobo_Property.idl
+share/idl/Bonobo_Sample_Echo.idl
+share/idl/Bonobo_Storage.idl
+share/idl/Bonobo_UI.idl
+share/idl/Bonobo_Unknown.idl
+share/idl/Bonobo_Zoomable.idl
+share/locale/az/LC_MESSAGES/bonobo.mo
 share/locale/ca/LC_MESSAGES/bonobo.mo
 share/locale/da/LC_MESSAGES/bonobo.mo
 share/locale/de/LC_MESSAGES/bonobo.mo
@@ -161,6 +249,7 @@ share/locale/pl/LC_MESSAGES/bonobo.mo
 share/locale/pt_BR/LC_MESSAGES/bonobo.mo
 share/locale/ro/LC_MESSAGES/bonobo.mo
 share/locale/ru/LC_MESSAGES/bonobo.mo
+share/locale/sk/LC_MESSAGES/bonobo.mo
 share/locale/sl/LC_MESSAGES/bonobo.mo
 share/locale/sv/LC_MESSAGES/bonobo.mo
 share/locale/tr/LC_MESSAGES/bonobo.mo
@@ -168,19 +257,18 @@ share/locale/uk/LC_MESSAGES/bonobo.mo
 share/locale/wa/LC_MESSAGES/bonobo.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/bonobo.mo
 share/mime-info/bonobo.keys
-share/oaf/Bonobo_Moniker_std.oafinfo
-share/oaf/Bonobo_Moniker_gzip.oafinfo
-share/oaf/Bonobo_Moniker_http.oafinfo
-share/oaf/Bonobo_Selector.oafinfo
-share/oaf/Bonobo_Sample_Mines.oafinfo
-share/oaf/Bonobo_Sample_Text.oafinfo
-share/oaf/Bonobo_Sample_Audio.oafinfo
-share/oaf/Bonobo_Sample_Clock.oafinfo
-share/oaf/Bonobo_Sample_Calculator.oafinfo
+share/oaf/Bonobo_Moniker_gzip.oaf
+share/oaf/Bonobo_Moniker_http.oaf
+share/oaf/Bonobo_Moniker_std.oaf
+share/oaf/Bonobo_Sample_Audio.oaf
+share/oaf/Bonobo_Sample_CanvasItem.oaf
+share/oaf/Bonobo_Sample_Controls.oaf
+share/oaf/Bonobo_Sample_Echo.oaf
 share/oaf/Bonobo_Sample_Hello.oafinfo
-share/oaf/Bonobo_Sample_Paint.oafinfo
-share/oaf/Bonobo_Sample_CanvasItem.oafinfo
-share/oaf/Bonobo_Sample_Echo.oafinfo
+share/oaf/Bonobo_Sample_Mines.oaf
+share/oaf/Bonobo_Sample_Paint.oaf
+share/oaf/Bonobo_Sample_Text.oaf
+share/oaf/Bonobo_Selector.oaf
 @exec mkdir -p %D/share/gnome/bonobo/docs/audio_ulaw/C/images
 @dirrm include/bonobo
 @dirrm share/bonobo/html/bonobo
@@ -193,5 +281,6 @@ share/oaf/Bonobo_Sample_Echo.oafinfo
 @dirrm share/gnome/bonobo
 @dirrm share/gnome/ui
 @unexec rmdir %D/lib/pkgconfig 2>/dev/null || true
+@dirrm lib/bonobo/monikers
 @dirrm lib/bonobo/plugin
 @dirrm lib/bonobo