Nur in nimbus-0.1.4: autom4te.cache. diff -dur nimbus-0.1.4.orig/dark-index.theme nimbus-0.1.4/dark-index.theme --- nimbus-0.1.4.orig/dark-index.theme 2009-10-06 15:23:57.000000000 +0200 +++ nimbus-0.1.4/dark-index.theme 2009-11-22 16:41:57.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=Dark Nimbus -Comment=Sun Microsystems, Inc. alternative theme +Comment=OpenSolaris alternative theme for GNOME Encoding=UTF-8 [X-GNOME-Metatheme] diff -dur nimbus-0.1.4.orig/dark-index.theme.in nimbus-0.1.4/dark-index.theme.in --- nimbus-0.1.4.orig/dark-index.theme.in 2009-02-04 16:35:28.000000000 +0100 +++ nimbus-0.1.4/dark-index.theme.in 2009-11-22 16:41:57.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme _Name=Dark Nimbus -_Comment=Sun Microsystems, Inc. alternative theme +_Comment=OpenSolaris alternative theme for GNOME Encoding=UTF-8 [X-GNOME-Metatheme] diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/dark-gtkrc nimbus-0.1.4/gtk-engine/gtk-2.0/dark-gtkrc --- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/dark-gtkrc 2009-10-06 15:23:42.000000000 +0200 +++ nimbus-0.1.4/gtk-engine/gtk-2.0/dark-gtkrc 2009-11-22 16:00:53.000000000 +0100 @@ -1,5 +1,3 @@ -include "iconrc" - style "dark-defaut" { diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/gtkrc nimbus-0.1.4/gtk-engine/gtk-2.0/gtkrc --- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/gtkrc 2009-10-06 15:23:44.000000000 +0200 +++ nimbus-0.1.4/gtk-engine/gtk-2.0/gtkrc 2009-11-22 16:00:53.000000000 +0100 @@ -1,5 +1,3 @@ -include "iconrc" - style "default" { bg[NORMAL] = "#e8e9ed" diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/iconrc.in nimbus-0.1.4/gtk-engine/gtk-2.0/iconrc.in --- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/iconrc.in 2009-02-04 16:34:27.000000000 +0100 +++ nimbus-0.1.4/gtk-engine/gtk-2.0/iconrc.in 2009-11-22 03:54:07.000000000 +0100 @@ -1,4 +1,4 @@ -pixmap_path "@prefix@/share/themes/nimbus/gtk-2.0" +pixmap_path "@prefix@/share/icons/nimbus/24x24/stock" style "icon-style" { stock["gtk-dialog-authentication"] = {{ "dialog_authentication.png",*,*,*}} diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/light-gtkrc nimbus-0.1.4/gtk-engine/gtk-2.0/light-gtkrc --- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/light-gtkrc 2009-10-06 15:23:24.000000000 +0200 +++ nimbus-0.1.4/gtk-engine/gtk-2.0/light-gtkrc 2009-11-22 16:00:51.000000000 +0100 @@ -1,5 +1,3 @@ -include "iconrc" - style "default" { bg[NORMAL] = "#e8e9ed" diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/Makefile.am nimbus-0.1.4/gtk-engine/gtk-2.0/Makefile.am --- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/Makefile.am 2009-02-04 16:39:20.000000000 +0100 +++ nimbus-0.1.4/gtk-engine/gtk-2.0/Makefile.am 2009-11-22 03:54:07.000000000 +0100 @@ -1,9 +1,13 @@ themedir = $(datadir)/themes/$(PACKAGE)/gtk-2.0 darkthemedir = $(datadir)/themes/dark-$(PACKAGE)/gtk-2.0 lightthemedir = $(datadir)/themes/light-$(PACKAGE)/gtk-2.0 -theme_DATA = gtkrc \ - iconrc \ - dialog_authentication.png \ +theme_DATA = gtkrc + +iconrcdir = $(datadir)/icons/$(PACKAGE) +iconrc_DATA = iconrc + +icondir = $(datadir)/icons/$(PACKAGE)/24x24/stock +icon_DATA = dialog_authentication.png \ dialog_info.png \ dialog_warning.png \ dialog_error.png \ diff -dur nimbus-0.1.4.orig/gtk-engine/gtk-2.0/Makefile.in nimbus-0.1.4/gtk-engine/gtk-2.0/Makefile.in --- nimbus-0.1.4.orig/gtk-engine/gtk-2.0/Makefile.in 2009-10-09 14:37:47.000000000 +0200 +++ nimbus-0.1.4/gtk-engine/gtk-2.0/Makefile.in 2009-11-22 03:58:20.000000000 +0100 @@ -50,9 +50,12 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(themedir)" +am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(iconrcdir)" \ + "$(DESTDIR)$(themedir)" +iconDATA_INSTALL = $(INSTALL_DATA) +iconrcDATA_INSTALL = $(INSTALL_DATA) themeDATA_INSTALL = $(INSTALL_DATA) -DATA = $(theme_DATA) +DATA = $(icon_DATA) $(iconrc_DATA) $(theme_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -197,9 +200,11 @@ top_srcdir = @top_srcdir@ darkthemedir = $(datadir)/themes/dark-$(PACKAGE)/gtk-2.0 lightthemedir = $(datadir)/themes/light-$(PACKAGE)/gtk-2.0 -theme_DATA = gtkrc \ - iconrc \ - dialog_authentication.png \ +theme_DATA = gtkrc +iconrcdir = $(datadir)/icons/$(PACKAGE) +iconrc_DATA = iconrc +icondir = $(datadir)/icons/$(PACKAGE)/24x24/stock +icon_DATA = dialog_authentication.png \ dialog_info.png \ dialog_warning.png \ dialog_error.png \ @@ -342,6 +347,40 @@ clean-libtool: -rm -rf .libs _libs +install-iconDATA: $(icon_DATA) + @$(NORMAL_INSTALL) + test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" + @list='$(icon_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \ + $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \ + done + +uninstall-iconDATA: + @$(NORMAL_UNINSTALL) + @list='$(icon_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \ + rm -f "$(DESTDIR)$(icondir)/$$f"; \ + done +install-iconrcDATA: $(iconrc_DATA) + @$(NORMAL_INSTALL) + test -z "$(iconrcdir)" || $(MKDIR_P) "$(DESTDIR)$(iconrcdir)" + @list='$(iconrc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(iconrcDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconrcdir)/$$f'"; \ + $(iconrcDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconrcdir)/$$f"; \ + done + +uninstall-iconrcDATA: + @$(NORMAL_UNINSTALL) + @list='$(iconrc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(iconrcdir)/$$f'"; \ + rm -f "$(DESTDIR)$(iconrcdir)/$$f"; \ + done install-themeDATA: $(theme_DATA) @$(NORMAL_INSTALL) test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @@ -396,7 +435,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(themedir)"; do \ + for dir in "$(DESTDIR)$(icondir)" "$(DESTDIR)$(iconrcdir)" "$(DESTDIR)$(themedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -441,7 +480,8 @@ info-am: -install-data-am: install-data-local install-themeDATA +install-data-am: install-data-local install-iconDATA \ + install-iconrcDATA install-themeDATA install-dvi: install-dvi-am @@ -475,7 +515,8 @@ ps-am: -uninstall-am: uninstall-themeDATA +uninstall-am: uninstall-iconDATA uninstall-iconrcDATA \ + uninstall-themeDATA .MAKE: install-am install-strip @@ -484,12 +525,14 @@ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-data-local install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-themeDATA installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-themeDATA + install-html-am install-iconDATA install-iconrcDATA \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-themeDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-iconDATA uninstall-iconrcDATA \ + uninstall-themeDATA install-data-local: diff -dur nimbus-0.1.4.orig/icons/index.theme.in nimbus-0.1.4/icons/index.theme.in --- nimbus-0.1.4.orig/icons/index.theme.in 2009-02-04 16:35:26.000000000 +0100 +++ nimbus-0.1.4/icons/index.theme.in 2009-11-22 16:41:23.000000000 +0100 @@ -1,7 +1,8 @@ [Icon Theme] -Name=nimbus +Name=Nimbus +Comment=OpenSolaris default Icon Theme Inherits=Tango -Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes +Directories=12x12/actions,12x12/emblems,12x12/places,16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/emblems,16x16/places,16x16/mimetypes,16x16/status,192x192/apps,192x192/categories,192x192/devices,192x192/places,192x192/mimetypes,20x20/status,24x24/actions,24x24/animations,24x24/apps,24x24/categories,24x24/devices,24x24/emblems,24x24/places,24x24/mimetypes,24x24/status,24x24/stock,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/emblems,32x32/places,32x32/mimetypes,32x32/status,36x36/actions,36x36/animations,36x36/apps,36x36/categories,36x36/devices,36x36/places,36x36/mimetypes,48x48/actions,48x48/animations,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,48x48/status,48x48/emblems,72x72/apps,72x72/categories,72x72/places,72x72/mimetypes,96x96/apps,96x96/categories,96x96/devices,96x96/places,96x96/mimetypes Example=user-desktop [12x12/actions] @@ -129,6 +130,11 @@ Context=Status Type=Fixed +[24x24/stock] +Size=24 +Context=Stock +Type=Fixed + [32x32/actions] Size=32 Context=Actions diff -dur nimbus-0.1.4.orig/index.theme nimbus-0.1.4/index.theme --- nimbus-0.1.4.orig/index.theme 2009-10-06 15:23:57.000000000 +0200 +++ nimbus-0.1.4/index.theme 2009-11-22 16:41:57.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=Nimbus -Comment=Sun Microsystems, Inc. default theme +Comment=OpenSolaris default theme for GNOME Encoding=UTF-8 [X-GNOME-Metatheme] diff -dur nimbus-0.1.4.orig/index.theme.in nimbus-0.1.4/index.theme.in --- nimbus-0.1.4.orig/index.theme.in 2009-02-04 16:35:28.000000000 +0100 +++ nimbus-0.1.4/index.theme.in 2009-11-22 16:41:57.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme _Name=Nimbus -_Comment=Sun Microsystems, Inc. default theme +_Comment=OpenSolaris default theme for GNOME Encoding=UTF-8 [X-GNOME-Metatheme] diff -dur nimbus-0.1.4.orig/light-index.theme nimbus-0.1.4/light-index.theme --- nimbus-0.1.4.orig/light-index.theme 2009-10-06 15:23:58.000000000 +0200 +++ nimbus-0.1.4/light-index.theme 2009-11-22 16:41:57.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme Name=Light Nimbus -Comment=Sun Microsystems, Inc. alternative theme +Comment=OpenSolaris alternative theme for GNOME Encoding=UTF-8 [X-GNOME-Metatheme] diff -dur nimbus-0.1.4.orig/light-index.theme.in nimbus-0.1.4/light-index.theme.in --- nimbus-0.1.4.orig/light-index.theme.in 2009-02-04 16:39:24.000000000 +0100 +++ nimbus-0.1.4/light-index.theme.in 2009-11-22 16:41:57.000000000 +0100 @@ -1,7 +1,7 @@ [Desktop Entry] Type=X-GNOME-Metatheme _Name=Light Nimbus -_Comment=Sun Microsystems, Inc. alternative theme +_Comment=OpenSolaris alternative theme for GNOME Encoding=UTF-8 [X-GNOME-Metatheme]