[gnome-doc-utils] Moving icons into "status" subdirectory, for correct icon theme usage

[Shaun McCance <shaunm src gnome org>]

commit 586b182e486594e1b4b7b071b40dd61eb178fa5e
Author: Shaun McCance <shaunm gnome org>
Date:   Mon Sep 28 21:47:24 2009 -0500

    Moving icons into "status" subdirectory, for correct icon theme usage

 configure.in                                       |    2 ++
 data/icons/hicolor/48x48/Makefile.am               |   11 +----------
 data/icons/hicolor/48x48/status/Makefile.am        |   10 ++++++++++
 .../icons/hicolor/48x48/{ => status}/admon-bug.png |  Bin 2952 -> 2952 bytes
 .../hicolor/48x48/{ => status}/admon-caution.png   |  Bin 2959 -> 2959 bytes
 .../hicolor/48x48/{ => status}/admon-important.png |  Bin 2454 -> 2454 bytes
 .../hicolor/48x48/{ => status}/admon-note.png      |  Bin 1733 -> 1733 bytes
 .../icons/hicolor/48x48/{ => status}/admon-tip.png |  Bin 2491 -> 2491 bytes
 .../hicolor/48x48/{ => status}/admon-warning.png   |  Bin 2959 -> 2959 bytes
 data/icons/hicolor/scalable/Makefile.am            |   11 +----------
 data/icons/hicolor/scalable/status/Makefile.am     |   10 ++++++++++
 .../scalable/{ => status}/admon-bug-shadow.svg     |    0
 .../hicolor/scalable/{ => status}/admon-bug.svg    |    0
 .../scalable/{ => status}/admon-caution-shadow.svg |    0
 .../scalable/{ => status}/admon-caution.svg        |    0
 .../{ => status}/admon-important-shadow.svg        |    0
 .../scalable/{ => status}/admon-important.svg      |    0
 .../scalable/{ => status}/admon-note-shadow.svg    |    0
 .../hicolor/scalable/{ => status}/admon-note.svg   |    0
 .../scalable/{ => status}/admon-tip-shadow.svg     |    0
 .../hicolor/scalable/{ => status}/admon-tip.svg    |    0
 .../scalable/{ => status}/admon-warning-shadow.svg |    0
 .../scalable/{ => status}/admon-warning.svg        |    0
 tools/gnome-doc-tool.in                            |    2 +-
 24 files changed, 25 insertions(+), 21 deletions(-)
---
diff --git a/configure.in b/configure.in
index 0ae27e3..68fb8d4 100644
--- a/configure.in
+++ b/configure.in
@@ -50,7 +50,9 @@ data/Makefile
 data/icons/Makefile
 data/icons/hicolor/Makefile
 data/icons/hicolor/48x48/Makefile
+data/icons/hicolor/48x48/status/Makefile
 data/icons/hicolor/scalable/Makefile
+data/icons/hicolor/scalable/status/Makefile
 data/templates/Makefile
 data/watermarks/Makefile
 doc/Makefile
diff --git a/data/icons/hicolor/48x48/Makefile.am b/data/icons/hicolor/48x48/Makefile.am
index 3fd11b9..d52da2b 100644
--- a/data/icons/hicolor/48x48/Makefile.am
+++ b/data/icons/hicolor/48x48/Makefile.am
@@ -1,10 +1 @@
-icondir = $(datadir)/gnome-doc-utils/icons/hicolor/48x48
-icon_DATA =			\
-	admon-bug.png		\
-	admon-caution.png	\
-	admon-important.png	\
-	admon-note.png		\
-	admon-tip.png		\
-	admon-warning.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = status
diff --git a/data/icons/hicolor/48x48/status/Makefile.am b/data/icons/hicolor/48x48/status/Makefile.am
new file mode 100644
index 0000000..e63fa94
--- /dev/null
+++ b/data/icons/hicolor/48x48/status/Makefile.am
@@ -0,0 +1,10 @@
+icondir = $(datadir)/gnome-doc-utils/icons/hicolor/48x48/status
+icon_DATA =			\
+	admon-bug.png		\
+	admon-caution.png	\
+	admon-important.png	\
+	admon-note.png		\
+	admon-tip.png		\
+	admon-warning.png
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/hicolor/48x48/admon-bug.png b/data/icons/hicolor/48x48/status/admon-bug.png
similarity index 100%
rename from data/icons/hicolor/48x48/admon-bug.png
rename to data/icons/hicolor/48x48/status/admon-bug.png
diff --git a/data/icons/hicolor/48x48/admon-caution.png b/data/icons/hicolor/48x48/status/admon-caution.png
similarity index 100%
rename from data/icons/hicolor/48x48/admon-caution.png
rename to data/icons/hicolor/48x48/status/admon-caution.png
diff --git a/data/icons/hicolor/48x48/admon-important.png b/data/icons/hicolor/48x48/status/admon-important.png
similarity index 100%
rename from data/icons/hicolor/48x48/admon-important.png
rename to data/icons/hicolor/48x48/status/admon-important.png
diff --git a/data/icons/hicolor/48x48/admon-note.png b/data/icons/hicolor/48x48/status/admon-note.png
similarity index 100%
rename from data/icons/hicolor/48x48/admon-note.png
rename to data/icons/hicolor/48x48/status/admon-note.png
diff --git a/data/icons/hicolor/48x48/admon-tip.png b/data/icons/hicolor/48x48/status/admon-tip.png
similarity index 100%
rename from data/icons/hicolor/48x48/admon-tip.png
rename to data/icons/hicolor/48x48/status/admon-tip.png
diff --git a/data/icons/hicolor/48x48/admon-warning.png b/data/icons/hicolor/48x48/status/admon-warning.png
similarity index 100%
rename from data/icons/hicolor/48x48/admon-warning.png
rename to data/icons/hicolor/48x48/status/admon-warning.png
diff --git a/data/icons/hicolor/scalable/Makefile.am b/data/icons/hicolor/scalable/Makefile.am
index fac94a5..d52da2b 100644
--- a/data/icons/hicolor/scalable/Makefile.am
+++ b/data/icons/hicolor/scalable/Makefile.am
@@ -1,10 +1 @@
-icondir = $(datadir)/gnome-doc-utils/icons/hicolor/scalable
-icon_DATA =			\
-	admon-caution.svg	\
-	admon-bug.svg		\
-	admon-important.svg	\
-	admon-note.svg		\
-	admon-tip.svg		\
-	admon-warning.svg
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = status
diff --git a/data/icons/hicolor/scalable/status/Makefile.am b/data/icons/hicolor/scalable/status/Makefile.am
new file mode 100644
index 0000000..bbdad20
--- /dev/null
+++ b/data/icons/hicolor/scalable/status/Makefile.am
@@ -0,0 +1,10 @@
+icondir = $(datadir)/gnome-doc-utils/icons/hicolor/scalable/status
+icon_DATA =			\
+	admon-caution.svg	\
+	admon-bug.svg		\
+	admon-important.svg	\
+	admon-note.svg		\
+	admon-tip.svg		\
+	admon-warning.svg
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/data/icons/hicolor/scalable/admon-bug-shadow.svg b/data/icons/hicolor/scalable/status/admon-bug-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-bug-shadow.svg
rename to data/icons/hicolor/scalable/status/admon-bug-shadow.svg
diff --git a/data/icons/hicolor/scalable/admon-bug.svg b/data/icons/hicolor/scalable/status/admon-bug.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-bug.svg
rename to data/icons/hicolor/scalable/status/admon-bug.svg
diff --git a/data/icons/hicolor/scalable/admon-caution-shadow.svg b/data/icons/hicolor/scalable/status/admon-caution-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-caution-shadow.svg
rename to data/icons/hicolor/scalable/status/admon-caution-shadow.svg
diff --git a/data/icons/hicolor/scalable/admon-caution.svg b/data/icons/hicolor/scalable/status/admon-caution.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-caution.svg
rename to data/icons/hicolor/scalable/status/admon-caution.svg
diff --git a/data/icons/hicolor/scalable/admon-important-shadow.svg b/data/icons/hicolor/scalable/status/admon-important-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-important-shadow.svg
rename to data/icons/hicolor/scalable/status/admon-important-shadow.svg
diff --git a/data/icons/hicolor/scalable/admon-important.svg b/data/icons/hicolor/scalable/status/admon-important.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-important.svg
rename to data/icons/hicolor/scalable/status/admon-important.svg
diff --git a/data/icons/hicolor/scalable/admon-note-shadow.svg b/data/icons/hicolor/scalable/status/admon-note-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-note-shadow.svg
rename to data/icons/hicolor/scalable/status/admon-note-shadow.svg
diff --git a/data/icons/hicolor/scalable/admon-note.svg b/data/icons/hicolor/scalable/status/admon-note.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-note.svg
rename to data/icons/hicolor/scalable/status/admon-note.svg
diff --git a/data/icons/hicolor/scalable/admon-tip-shadow.svg b/data/icons/hicolor/scalable/status/admon-tip-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-tip-shadow.svg
rename to data/icons/hicolor/scalable/status/admon-tip-shadow.svg
diff --git a/data/icons/hicolor/scalable/admon-tip.svg b/data/icons/hicolor/scalable/status/admon-tip.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-tip.svg
rename to data/icons/hicolor/scalable/status/admon-tip.svg
diff --git a/data/icons/hicolor/scalable/admon-warning-shadow.svg b/data/icons/hicolor/scalable/status/admon-warning-shadow.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-warning-shadow.svg
rename to data/icons/hicolor/scalable/status/admon-warning-shadow.svg
diff --git a/data/icons/hicolor/scalable/admon-warning.svg b/data/icons/hicolor/scalable/status/admon-warning.svg
similarity index 100%
rename from data/icons/hicolor/scalable/admon-warning.svg
rename to data/icons/hicolor/scalable/status/admon-warning.svg
diff --git a/tools/gnome-doc-tool.in b/tools/gnome-doc-tool.in
index b1f7ee8..cdaba69 100644
--- a/tools/gnome-doc-tool.in
+++ b/tools/gnome-doc-tool.in
@@ -200,7 +200,7 @@ DO_html() {
 	for graphic in `echo $graphics | tr ' ' '\n' | grep '^admon-'`; do
 	    param="theme.icon."`echo $graphic | sed -e 's/\.png$//' -e 's/-/./'`;
 	    if [ "x$doc_admon_graphics_path" = "x" ]; then
-		cmd="cp \"$pkgdatadir/icons/hicolor/48x48/$graphic\" \"$doc_outdir/$graphic\""
+		cmd="cp \"$pkgdatadir/icons/hicolor/48x48/status/$graphic\" \"$doc_outdir/$graphic\""
 		echo_verbose "$cmd"
 		eval "$cmd"
 		params="$params --stringparam $param \"$graphic\""