Update to 3.3.1, and temporarily disable Python support.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9041 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 253 insertions, 247 deletions

diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index 5afd03f94..61bed213d 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -1,12 +1,9 @@
 bin/glade-3
-include/libgladeui-1.0/gladeui/atk.xpm
 include/libgladeui-1.0/gladeui/fixed_bg.xpm
-include/libgladeui-1.0/gladeui/glade-accumulators.h
 include/libgladeui-1.0/gladeui/glade-app.h
 include/libgladeui-1.0/gladeui/glade-base-editor.h
 include/libgladeui-1.0/gladeui/glade-binding.h
 include/libgladeui-1.0/gladeui/glade-builtins.h
-include/libgladeui-1.0/gladeui/glade-catalog.h
 include/libgladeui-1.0/gladeui/glade-clipboard-view.h
 include/libgladeui-1.0/gladeui/glade-clipboard.h
 include/libgladeui-1.0/gladeui/glade-command.h
@@ -18,16 +15,11 @@ include/libgladeui-1.0/gladeui/glade-design-view.h
 include/libgladeui-1.0/gladeui/glade-editor-property.h
 include/libgladeui-1.0/gladeui/glade-editor.h
 include/libgladeui-1.0/gladeui/glade-fixed.h
-include/libgladeui-1.0/gladeui/glade-id-allocator.h
-include/libgladeui-1.0/gladeui/glade-marshallers.h
-include/libgladeui-1.0/gladeui/glade-palette-box.h
-include/libgladeui-1.0/gladeui/glade-palette-expander.h
 include/libgladeui-1.0/gladeui/glade-palette-item.h
 include/libgladeui-1.0/gladeui/glade-palette.h
 include/libgladeui-1.0/gladeui/glade-parameter.h
 include/libgladeui-1.0/gladeui/glade-parser.h
 include/libgladeui-1.0/gladeui/glade-placeholder.h
-include/libgladeui-1.0/gladeui/glade-popup.h
 include/libgladeui-1.0/gladeui/glade-project-view.h
 include/libgladeui-1.0/gladeui/glade-project.h
 include/libgladeui-1.0/gladeui/glade-property-class.h
@@ -35,20 +27,23 @@ include/libgladeui-1.0/gladeui/glade-property.h
 include/libgladeui-1.0/gladeui/glade-signal-editor.h
 include/libgladeui-1.0/gladeui/glade-signal.h
 include/libgladeui-1.0/gladeui/glade-utils.h
+include/libgladeui-1.0/gladeui/glade-widget-action.h
 include/libgladeui-1.0/gladeui/glade-widget-adaptor.h
 include/libgladeui-1.0/gladeui/glade-widget.h
 include/libgladeui-1.0/gladeui/glade-xml-utils.h
 include/libgladeui-1.0/gladeui/glade.h
-%%PYTHON:%%lib/glade3/bindings/libgladepython.la
-%%PYTHON:%%lib/glade3/bindings/libgladepython.so
+%%GNOME:%%lib/glade3/modules/libgladegnome.a
 %%GNOME:%%lib/glade3/modules/libgladegnome.la
 %%GNOME:%%lib/glade3/modules/libgladegnome.so
+lib/glade3/modules/libgladegtk.a
 lib/glade3/modules/libgladegtk.la
 lib/glade3/modules/libgladegtk.so
+lib/libgladeui-1.a
 lib/libgladeui-1.la
 lib/libgladeui-1.so
-lib/libgladeui-1.so.5
+lib/libgladeui-1.so.6
 libdata/pkgconfig/gladeui-1.0.pc
+share/applications/glade-3.desktop
 %%DOCSDIR%%/GladeApp.html
 %%DOCSDIR%%/GladeClipboard.html
 %%DOCSDIR%%/GladeClipboardView.html
@@ -86,7 +81,6 @@ libdata/pkgconfig/gladeui-1.0.pc
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
 %%DOCSDIR%%/widgetclasses.html
-share/applications/glade-3.desktop
 %%GNOME:%%share/glade3/catalogs/bonobo.xml
 %%GNOME:%%share/glade3/catalogs/bonobo.xml.in
 %%GNOME:%%share/glade3/catalogs/canvas.xml
@@ -95,229 +89,237 @@ share/applications/glade-3.desktop
 %%GNOME:%%share/glade3/catalogs/gnome.xml.in
 share/glade3/catalogs/gtk+.xml
 share/glade3/catalogs/gtk+.xml.in
-share/glade3/pixmaps/16x16/aboutdialog.png
-share/glade3/pixmaps/16x16/accellabel.png
-share/glade3/pixmaps/16x16/alignment.png
-share/glade3/pixmaps/16x16/arrow.png
-share/glade3/pixmaps/16x16/aspectframe.png
-share/glade3/pixmaps/16x16/assistant.png
-%%GNOME:%%share/glade3/pixmaps/16x16/bonobodock.png
-%%GNOME:%%share/glade3/pixmaps/16x16/bonobodockitem.png
-share/glade3/pixmaps/16x16/button.png
-share/glade3/pixmaps/16x16/calendar.png
-share/glade3/pixmaps/16x16/checkbutton.png
-share/glade3/pixmaps/16x16/checkmenuitem.png
-share/glade3/pixmaps/16x16/clist.png
-share/glade3/pixmaps/16x16/colorbutton.png
-share/glade3/pixmaps/16x16/colorselection.png
-share/glade3/pixmaps/16x16/colorselectiondialog.png
-share/glade3/pixmaps/16x16/combo.png
-share/glade3/pixmaps/16x16/combobox.png
-share/glade3/pixmaps/16x16/comboboxentry.png
-share/glade3/pixmaps/16x16/curve.png
-share/glade3/pixmaps/16x16/custom.png
-share/glade3/pixmaps/16x16/dialog.png
-share/glade3/pixmaps/16x16/drawingarea.png
-share/glade3/pixmaps/16x16/entry.png
-share/glade3/pixmaps/16x16/eventbox.png
-share/glade3/pixmaps/16x16/expander.png
-share/glade3/pixmaps/16x16/filechooserbutton.png
-share/glade3/pixmaps/16x16/filechooserdialog.png
-share/glade3/pixmaps/16x16/fileselection.png
-share/glade3/pixmaps/16x16/fixed.png
-share/glade3/pixmaps/16x16/fontbutton.png
-share/glade3/pixmaps/16x16/fontselection.png
-share/glade3/pixmaps/16x16/fontselectiondialog.png
-share/glade3/pixmaps/16x16/frame.png
-share/glade3/pixmaps/16x16/gammacurve.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomeabout.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomeapp.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomeappbar.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomecanvas.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomecolorpicker.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomedateedit.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomedialog.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomedruid.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomedruidpageedge.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomedruidpagestandard.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomeentry.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomefileentry.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomefontpicker.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomehref.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomeiconentry.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomeiconlist.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomeiconselection.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomemessagebox.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomepixmap.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomepixmapentry.png
-%%GNOME:%%share/glade3/pixmaps/16x16/gnomepropertybox.png
-share/glade3/pixmaps/16x16/handlebox.png
-share/glade3/pixmaps/16x16/hbox.png
-share/glade3/pixmaps/16x16/hbuttonbox.png
-share/glade3/pixmaps/16x16/hpaned.png
-share/glade3/pixmaps/16x16/hruler.png
-share/glade3/pixmaps/16x16/hscale.png
-share/glade3/pixmaps/16x16/hscrollbar.png
-share/glade3/pixmaps/16x16/hseparator.png
-share/glade3/pixmaps/16x16/iconview.png
-share/glade3/pixmaps/16x16/image.png
-share/glade3/pixmaps/16x16/imagemenuitem.png
-share/glade3/pixmaps/16x16/inputdialog.png
-share/glade3/pixmaps/16x16/label.png
-share/glade3/pixmaps/16x16/layout.png
-share/glade3/pixmaps/16x16/linkbutton.png
-share/glade3/pixmaps/16x16/list.png
-share/glade3/pixmaps/16x16/listitem.png
-share/glade3/pixmaps/16x16/menu.png
-share/glade3/pixmaps/16x16/menubar.png
-share/glade3/pixmaps/16x16/menuitem.png
-share/glade3/pixmaps/16x16/menutoolbutton.png
-share/glade3/pixmaps/16x16/messagedialog.png
-share/glade3/pixmaps/16x16/notebook.png
-share/glade3/pixmaps/16x16/optionmenu.png
-share/glade3/pixmaps/16x16/pagesetupdialog.png
-share/glade3/pixmaps/16x16/printdialog.png
-share/glade3/pixmaps/16x16/progressbar.png
-share/glade3/pixmaps/16x16/radiobutton.png
-share/glade3/pixmaps/16x16/radiomenuitem.png
-share/glade3/pixmaps/16x16/radiotoolbutton.png
-share/glade3/pixmaps/16x16/recentchooser.png
-share/glade3/pixmaps/16x16/recentchooserdialog.png
-share/glade3/pixmaps/16x16/ruler.png
-share/glade3/pixmaps/16x16/scrolledwindow.png
-share/glade3/pixmaps/16x16/separatormenuitem.png
-share/glade3/pixmaps/16x16/separatortoolitem.png
-share/glade3/pixmaps/16x16/spinbutton.png
-share/glade3/pixmaps/16x16/statusbar.png
-share/glade3/pixmaps/16x16/table.png
-share/glade3/pixmaps/16x16/textview.png
-share/glade3/pixmaps/16x16/togglebutton.png
-share/glade3/pixmaps/16x16/toggletoolbutton.png
-share/glade3/pixmaps/16x16/toolbar.png
-share/glade3/pixmaps/16x16/toolbutton.png
-share/glade3/pixmaps/16x16/toolitem.png
-share/glade3/pixmaps/16x16/treeview.png
-share/glade3/pixmaps/16x16/vbox.png
-share/glade3/pixmaps/16x16/vbuttonbox.png
-share/glade3/pixmaps/16x16/viewport.png
-share/glade3/pixmaps/16x16/vpaned.png
-share/glade3/pixmaps/16x16/vruler.png
-share/glade3/pixmaps/16x16/vscale.png
-share/glade3/pixmaps/16x16/vscrollbar.png
-share/glade3/pixmaps/16x16/vseparator.png
-share/glade3/pixmaps/16x16/window.png
-share/glade3/pixmaps/22x22/aboutdialog.png
-share/glade3/pixmaps/22x22/accellabel.png
-share/glade3/pixmaps/22x22/alignment.png
-share/glade3/pixmaps/22x22/arrow.png
-share/glade3/pixmaps/22x22/aspectframe.png
-share/glade3/pixmaps/22x22/assistant.png
-%%GNOME:%%share/glade3/pixmaps/22x22/bonobodock.png
-%%GNOME:%%share/glade3/pixmaps/22x22/bonobodockitem.png
-share/glade3/pixmaps/22x22/button.png
-share/glade3/pixmaps/22x22/calendar.png
-share/glade3/pixmaps/22x22/checkbutton.png
-share/glade3/pixmaps/22x22/checkmenuitem.png
-share/glade3/pixmaps/22x22/clist.png
-share/glade3/pixmaps/22x22/colorbutton.png
-share/glade3/pixmaps/22x22/colorselection.png
-share/glade3/pixmaps/22x22/colorselectiondialog.png
-share/glade3/pixmaps/22x22/combo.png
-share/glade3/pixmaps/22x22/combobox.png
-share/glade3/pixmaps/22x22/comboboxentry.png
-share/glade3/pixmaps/22x22/curve.png
-share/glade3/pixmaps/22x22/custom.png
-share/glade3/pixmaps/22x22/dialog.png
-share/glade3/pixmaps/22x22/drawingarea.png
-share/glade3/pixmaps/22x22/entry.png
-share/glade3/pixmaps/22x22/eventbox.png
-share/glade3/pixmaps/22x22/expander.png
-share/glade3/pixmaps/22x22/filechooserbutton.png
-share/glade3/pixmaps/22x22/filechooserdialog.png
-share/glade3/pixmaps/22x22/fileselection.png
-share/glade3/pixmaps/22x22/fixed.png
-share/glade3/pixmaps/22x22/fontbutton.png
-share/glade3/pixmaps/22x22/fontselection.png
-share/glade3/pixmaps/22x22/fontselectiondialog.png
-share/glade3/pixmaps/22x22/frame.png
-share/glade3/pixmaps/22x22/gammacurve.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomeabout.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomeapp.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomeappbar.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomecanvas.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomecolorpicker.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomedateedit.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomedialog.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomedruid.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomedruidpageedge.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomedruidpagestandard.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomeentry.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomefileentry.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomefontpicker.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomehref.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomeiconentry.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomeiconlist.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomeiconselection.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomemessagebox.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomepixmap.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomepixmapentry.png
-%%GNOME:%%share/glade3/pixmaps/22x22/gnomepropertybox.png
-share/glade3/pixmaps/22x22/handlebox.png
-share/glade3/pixmaps/22x22/hbox.png
-share/glade3/pixmaps/22x22/hbuttonbox.png
-share/glade3/pixmaps/22x22/hpaned.png
-share/glade3/pixmaps/22x22/hruler.png
-share/glade3/pixmaps/22x22/hscale.png
-share/glade3/pixmaps/22x22/hscrollbar.png
-share/glade3/pixmaps/22x22/hseparator.png
-share/glade3/pixmaps/22x22/iconview.png
-share/glade3/pixmaps/22x22/image.png
-share/glade3/pixmaps/22x22/imagemenuitem.png
-share/glade3/pixmaps/22x22/inputdialog.png
-share/glade3/pixmaps/22x22/label.png
-share/glade3/pixmaps/22x22/layout.png
-share/glade3/pixmaps/22x22/linkbutton.png
-share/glade3/pixmaps/22x22/list.png
-share/glade3/pixmaps/22x22/listitem.png
-share/glade3/pixmaps/22x22/menu.png
-share/glade3/pixmaps/22x22/menubar.png
-share/glade3/pixmaps/22x22/menuitem.png
-share/glade3/pixmaps/22x22/menutoolbutton.png
-share/glade3/pixmaps/22x22/messagedialog.png
-share/glade3/pixmaps/22x22/notebook.png
-share/glade3/pixmaps/22x22/optionmenu.png
-share/glade3/pixmaps/22x22/pagesetupdialog.png
-share/glade3/pixmaps/22x22/printdialog.png
-share/glade3/pixmaps/22x22/progressbar.png
-share/glade3/pixmaps/22x22/radiobutton.png
-share/glade3/pixmaps/22x22/radiomenuitem.png
-share/glade3/pixmaps/22x22/radiotoolbutton.png
-share/glade3/pixmaps/22x22/recentchooser.png
-share/glade3/pixmaps/22x22/recentchooserdialog.png
-share/glade3/pixmaps/22x22/ruler.png
-share/glade3/pixmaps/22x22/scrolledwindow.png
-share/glade3/pixmaps/22x22/separatormenuitem.png
-share/glade3/pixmaps/22x22/separatortoolitem.png
-share/glade3/pixmaps/22x22/spinbutton.png
-share/glade3/pixmaps/22x22/statusbar.png
-share/glade3/pixmaps/22x22/table.png
-share/glade3/pixmaps/22x22/textview.png
-share/glade3/pixmaps/22x22/togglebutton.png
-share/glade3/pixmaps/22x22/toggletoolbutton.png
-share/glade3/pixmaps/22x22/toolbar.png
-share/glade3/pixmaps/22x22/toolbutton.png
-share/glade3/pixmaps/22x22/toolitem.png
-share/glade3/pixmaps/22x22/treeview.png
-share/glade3/pixmaps/22x22/vbox.png
-share/glade3/pixmaps/22x22/vbuttonbox.png
-share/glade3/pixmaps/22x22/viewport.png
-share/glade3/pixmaps/22x22/vpaned.png
-share/glade3/pixmaps/22x22/vruler.png
-share/glade3/pixmaps/22x22/vscale.png
-share/glade3/pixmaps/22x22/vscrollbar.png
-share/glade3/pixmaps/22x22/vseparator.png
-share/glade3/pixmaps/22x22/window.png
+share/glade3/catalogs/gtkunixprint.xml
+share/glade3/catalogs/gtkunixprint.xml.in
+share/glade3/pixmaps/atk.png
 share/glade3/pixmaps/devhelp.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-bonobo-dock.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-bonobo-dockitem.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-about.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-app.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-appbar.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-canvas.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-colorpicker.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-dateedit.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-dialog.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-druid.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-druidpageedge.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-druidpagestandard.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-entry.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-fileentry.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-fontpicker.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-href.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-iconentry.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-iconlist.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-iconselection.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-messagebox.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-pixmap.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-pixmapentry.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-propertybox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-arrow.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-aspectframe.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-button.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-calendar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-checkmenuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-clist.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-colorbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-colorselection.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-combo.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxentry.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-curve.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-custom.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-default.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-dialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-drawingarea.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-entry.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-eventbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-expander.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserwidget.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fileselection.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fixed.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fontbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fontselection.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-frame.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-gammacurve.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-gtktextview.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hpaned.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hruler.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hseparator.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-image.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-imagemenuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-inputdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-label.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-layout.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-linkbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-list.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-listitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-menutoolbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-messagedialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-notebook.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-optionmenu.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-radiomenuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooser.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-ruler.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-separatortoolitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-table.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-toolbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-toolbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-toolitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vbuttonbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-viewport.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vpaned.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vruler.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vscrollbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-window.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-bonobo-dock.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-bonobo-dockitem.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-about.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-app.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-appbar.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-canvas.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-colorpicker.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-dateedit.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-dialog.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-druid.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-druidpageedge.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-druidpagestandard.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-entry.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-fileentry.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-fontpicker.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-href.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-iconentry.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-iconlist.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-iconselection.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-messagebox.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-pixmap.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-pixmapentry.png
+%%GNOME:%%share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-propertybox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-arrow.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-aspectframe.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-assistant.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-button.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-calendar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-checkbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-checkmenuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-clist.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-colorbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-colorselection.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-combo.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxentry.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-curve.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-custom.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-default.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-dialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-drawingarea.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-entry.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-eventbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-expander.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserwidget.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fileselection.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fixed.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fontbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fontselection.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-frame.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-gammacurve.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-handlebox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hbuttonbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hpaned.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hruler.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hseparator.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-iconview.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-image.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-imagemenuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-inputdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-label.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-layout.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-linkbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-list.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-listitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-menutoolbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-messagedialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-notebook.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-optionmenu.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-radiobutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-radiomenuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooser.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-ruler.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-separatortoolitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-spinbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-table.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-textview.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-togglebutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-toolbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-toolbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-toolitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-treeview.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vbuttonbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-viewport.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vpaned.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vruler.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vscale.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vscrollbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vseparator.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-window.png
 share/glade3/pixmaps/plus.png
 share/glade3/pixmaps/selector.png
 share/gnome/help/glade/C/figures/main-window.png
@@ -338,12 +340,6 @@ share/gnome/help/glade/fr/legal.xml
 share/gnome/help/glade/sv/figures/main-window.png
 share/gnome/help/glade/sv/glade.xml
 share/gnome/help/glade/sv/legal.xml
-share/omf/glade/glade-C.omf
-share/omf/glade/glade-bg.omf
-share/omf/glade/glade-en_GB.omf
-share/omf/glade/glade-es.omf
-share/omf/glade/glade-fr.omf
-share/omf/glade/glade-sv.omf
 share/icons/hicolor/16x16/apps/glade-3.png
 share/icons/hicolor/22x22/apps/glade-3.png
 share/icons/hicolor/24x24/apps/glade-3.png
@@ -356,7 +352,6 @@ share/locale/bg/LC_MESSAGES/glade3.mo
 share/locale/ca/LC_MESSAGES/glade3.mo
 share/locale/da/LC_MESSAGES/glade3.mo
 share/locale/de/LC_MESSAGES/glade3.mo
-share/locale/dz/LC_MESSAGES/glade3.mo
 share/locale/el/LC_MESSAGES/glade3.mo
 share/locale/en_CA/LC_MESSAGES/glade3.mo
 share/locale/en_GB/LC_MESSAGES/glade3.mo
@@ -373,6 +368,8 @@ share/locale/ml/LC_MESSAGES/glade3.mo
 share/locale/ms/LC_MESSAGES/glade3.mo
 share/locale/nb/LC_MESSAGES/glade3.mo
 share/locale/nn/LC_MESSAGES/glade3.mo
+share/locale/oc/LC_MESSAGES/glade3.mo
+share/locale/or/LC_MESSAGES/glade3.mo
 share/locale/pa/LC_MESSAGES/glade3.mo
 share/locale/pl/LC_MESSAGES/glade3.mo
 share/locale/pt/LC_MESSAGES/glade3.mo
@@ -389,7 +386,17 @@ share/locale/vi/LC_MESSAGES/glade3.mo
 share/locale/zh_CN/LC_MESSAGES/glade3.mo
 share/locale/zh_HK/LC_MESSAGES/glade3.mo
 share/locale/zh_TW/LC_MESSAGES/glade3.mo
+share/omf/glade/glade-C.omf
+share/omf/glade/glade-bg.omf
+share/omf/glade/glade-en_GB.omf
+share/omf/glade/glade-es.omf
+share/omf/glade/glade-fr.omf
+share/omf/glade/glade-sv.omf
 @dirrm share/omf/glade
+@dirrm share/locale/zh_HK/LC_MESSAGES
+@dirrm share/locale/zh_HK
+@dirrm share/locale/oc/LC_MESSAGES
+@dirrm share/locale/oc
 @dirrm share/gnome/help/glade/sv/figures
 @dirrm share/gnome/help/glade/sv
 @dirrm share/gnome/help/glade/fr/figures
@@ -403,8 +410,11 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
 @dirrm share/gnome/help/glade/C/figures
 @dirrm share/gnome/help/glade/C
 @dirrm share/gnome/help/glade
-@dirrm share/glade3/pixmaps/22x22
-@dirrm share/glade3/pixmaps/16x16
+@dirrm share/glade3/pixmaps/hicolor/22x22/actions
+@dirrm share/glade3/pixmaps/hicolor/22x22
+@dirrm share/glade3/pixmaps/hicolor/16x16/actions
+@dirrm share/glade3/pixmaps/hicolor/16x16
+@dirrm share/glade3/pixmaps/hicolor
 @dirrm share/glade3/pixmaps
 @dirrm share/glade3/catalogs
 @dirrm share/glade3
@@ -416,7 +426,3 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
 @dirrm include/libgladeui-1.0
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz