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