[Xfce4-commits] <xfce4-notes-plugin:master> Moves icons source directory inside data

[Mike Massonnet]

Updating branch refs/heads/master
         to 37457916364e64889071eb565ab740bf5b16a8f0 (commit)
       from e69e13f5fe0b1df9e7c345c674dde2aa9d30f2a7 (commit)

commit 37457916364e64889071eb565ab740bf5b16a8f0
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Mon Mar 8 22:20:08 2010 +0100

    Moves icons source directory inside data

 ChangeLog                                          |    4 ++++
 Makefile.am                                        |    1 -
 configure.ac.in                                    |   12 ++++++------
 data/Makefile.am                                   |    4 +++-
 {icons => data/icons}/16x16/Makefile.am            |    0
 {icons => data/icons}/16x16/xfce4-notes-plugin.png |  Bin 667 -> 667 bytes
 {icons => data/icons}/22x22/Makefile.am            |    0
 {icons => data/icons}/22x22/xfce4-notes-plugin.png |  Bin 910 -> 910 bytes
 {icons => data/icons}/24x24/Makefile.am            |    0
 {icons => data/icons}/24x24/xfce4-notes-plugin.png |  Bin 909 -> 909 bytes
 {icons => data/icons}/32x32/Makefile.am            |    0
 {icons => data/icons}/32x32/xfce4-notes-plugin.png |  Bin 1255 -> 1255 bytes
 {icons => data/icons}/Makefile.am                  |    0
 {icons => data/icons}/scalable/Makefile.am         |    0
 .../icons}/scalable/xfce4-notes-plugin.svg         |    0
 15 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 47e8be5..118936e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-03-08  Mike Massonnet <mmassonnet at xfce.org>
 
+Moves icons source directory inside data
+
+2010-03-08  Mike Massonnet <mmassonnet at xfce.org>
+
 Align the title on the left
 
 2010-03-08  Mike Massonnet <mmassonnet at xfce.org>
diff --git a/Makefile.am b/Makefile.am
index c529b42..23b69e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@
 
 SUBDIRS =								\
 	data								\
-	icons								\
 	lib								\
 	src								\
 	po
diff --git a/configure.ac.in b/configure.ac.in
index 2a7f010..c461a58 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -83,12 +83,12 @@ Makefile
 data/Makefile
 data/gtk-2.0/Makefile
 data/gtk-2.0/scrollbars/Makefile
-icons/Makefile
-icons/16x16/Makefile
-icons/22x22/Makefile
-icons/24x24/Makefile
-icons/32x32/Makefile
-icons/scalable/Makefile
+data/icons/Makefile
+data/icons/16x16/Makefile
+data/icons/22x22/Makefile
+data/icons/24x24/Makefile
+data/icons/32x32/Makefile
+data/icons/scalable/Makefile
 lib/Makefile
 src/Makefile
 po/Makefile.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 5c631fb..5083083 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1,3 @@
-SUBDIRS = gtk-2.0
+SUBDIRS =								\
+	gtk-2.0								\
+	icons
diff --git a/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
similarity index 100%
rename from icons/16x16/Makefile.am
rename to data/icons/16x16/Makefile.am
diff --git a/icons/16x16/xfce4-notes-plugin.png b/data/icons/16x16/xfce4-notes-plugin.png
similarity index 100%
rename from icons/16x16/xfce4-notes-plugin.png
rename to data/icons/16x16/xfce4-notes-plugin.png
diff --git a/icons/22x22/Makefile.am b/data/icons/22x22/Makefile.am
similarity index 100%
rename from icons/22x22/Makefile.am
rename to data/icons/22x22/Makefile.am
diff --git a/icons/22x22/xfce4-notes-plugin.png b/data/icons/22x22/xfce4-notes-plugin.png
similarity index 100%
rename from icons/22x22/xfce4-notes-plugin.png
rename to data/icons/22x22/xfce4-notes-plugin.png
diff --git a/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
similarity index 100%
rename from icons/24x24/Makefile.am
rename to data/icons/24x24/Makefile.am
diff --git a/icons/24x24/xfce4-notes-plugin.png b/data/icons/24x24/xfce4-notes-plugin.png
similarity index 100%
rename from icons/24x24/xfce4-notes-plugin.png
rename to data/icons/24x24/xfce4-notes-plugin.png
diff --git a/icons/32x32/Makefile.am b/data/icons/32x32/Makefile.am
similarity index 100%
rename from icons/32x32/Makefile.am
rename to data/icons/32x32/Makefile.am
diff --git a/icons/32x32/xfce4-notes-plugin.png b/data/icons/32x32/xfce4-notes-plugin.png
similarity index 100%
rename from icons/32x32/xfce4-notes-plugin.png
rename to data/icons/32x32/xfce4-notes-plugin.png
diff --git a/icons/Makefile.am b/data/icons/Makefile.am
similarity index 100%
rename from icons/Makefile.am
rename to data/icons/Makefile.am
diff --git a/icons/scalable/Makefile.am b/data/icons/scalable/Makefile.am
similarity index 100%
rename from icons/scalable/Makefile.am
rename to data/icons/scalable/Makefile.am
diff --git a/icons/scalable/xfce4-notes-plugin.svg b/data/icons/scalable/xfce4-notes-plugin.svg
similarity index 100%
rename from icons/scalable/xfce4-notes-plugin.svg
rename to data/icons/scalable/xfce4-notes-plugin.svg