[giggle] Move pixmaps/ to data/icons/

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 6d8446e36082cffb9e68b30f75f29510cd24d9e6
Author: Javier Jardón <jjardon gnome org>
Date:   Thu Aug 11 16:58:17 2016 +0100

    Move pixmaps/ to data/icons/

 Makefile.am                                        |    2 +-
 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    2 ++
 {pixmaps => data/icons}/16x16/giggle-branch.png    |  Bin 697 -> 697 bytes
 .../icons}/16x16/giggle-history-view.png           |  Bin 842 -> 842 bytes
 .../icons}/16x16/giggle-history-view.svg           |    0
 {pixmaps => data/icons}/16x16/giggle-remote.png    |  Bin 911 -> 911 bytes
 {pixmaps => data/icons}/16x16/giggle-scm-git.png   |  Bin 375 -> 375 bytes
 {pixmaps => data/icons}/16x16/giggle-scm-svn.png   |  Bin 543 -> 543 bytes
 {pixmaps => data/icons}/16x16/giggle-tag.png       |  Bin 811 -> 811 bytes
 {pixmaps => data/icons}/16x16/giggle.png           |  Bin 902 -> 902 bytes
 .../icons}/22x22/giggle-history-view.png           |  Bin 1498 -> 1498 bytes
 .../icons}/22x22/giggle-history-view.svg           |    0
 {pixmaps => data/icons}/22x22/giggle.png           |  Bin 1346 -> 1346 bytes
 {pixmaps => data/icons}/24x24/giggle-diff-view.png |  Bin 732 -> 732 bytes
 .../icons}/24x24/giggle-history-view.png           |  Bin 1511 -> 1511 bytes
 .../icons}/24x24/giggle-history-view.svg           |    0
 {pixmaps => data/icons}/24x24/giggle.png           |  Bin 1343 -> 1343 bytes
 .../icons}/32x32/giggle-history-view.png           |  Bin 2426 -> 2426 bytes
 .../icons}/32x32/giggle-history-view.svg           |    0
 {pixmaps => data/icons}/32x32/giggle.png           |  Bin 2154 -> 2154 bytes
 {pixmaps => data/icons}/48x48/giggle-scm-svn.png   |  Bin 1319 -> 1319 bytes
 {pixmaps => data/icons}/48x48/giggle.png           |  Bin 3288 -> 3288 bytes
 {pixmaps => data/icons}/Makefile.am                |    0
 .../icons}/scalable/giggle-history-view.png        |    0
 .../icons}/scalable/giggle-history-view.svg        |    0
 {pixmaps => data/icons}/scalable/giggle.svg        |    0
 27 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 01944b7..feca4ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = data libgiggle libgiggle-git plugins src po pixmaps help test
+SUBDIRS = data libgiggle libgiggle-git plugins src po help test
 
 EXTRA_DIST = \
        build-aux/config.rpath
diff --git a/configure.ac b/configure.ac
index 0a8f83b..236bb4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,10 +170,10 @@ AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
 AC_CONFIG_FILES([
         Makefile
         data/Makefile
+        data/icons/Makefile
         help/Makefile
         libgiggle/Makefile
         libgiggle-git/Makefile
-        pixmaps/Makefile
         plugins/Makefile
         po/Makefile.in
         src/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 8763d15..c8f84eb 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 gladedir = $(datadir)/giggle/glade
 dist_glade_DATA = \
        main-window.ui
diff --git a/pixmaps/16x16/giggle-history-view.svg b/data/icons/16x16/giggle-history-view.svg
similarity index 100%
rename from pixmaps/16x16/giggle-history-view.svg
rename to data/icons/16x16/giggle-history-view.svg
diff --git a/pixmaps/22x22/giggle-history-view.svg b/data/icons/22x22/giggle-history-view.svg
similarity index 100%
rename from pixmaps/22x22/giggle-history-view.svg
rename to data/icons/22x22/giggle-history-view.svg
diff --git a/pixmaps/24x24/giggle-history-view.svg b/data/icons/24x24/giggle-history-view.svg
similarity index 100%
rename from pixmaps/24x24/giggle-history-view.svg
rename to data/icons/24x24/giggle-history-view.svg
diff --git a/pixmaps/32x32/giggle-history-view.svg b/data/icons/32x32/giggle-history-view.svg
similarity index 100%
rename from pixmaps/32x32/giggle-history-view.svg
rename to data/icons/32x32/giggle-history-view.svg
diff --git a/pixmaps/Makefile.am b/data/icons/Makefile.am
similarity index 100%
rename from pixmaps/Makefile.am
rename to data/icons/Makefile.am
diff --git a/pixmaps/scalable/giggle-history-view.png b/data/icons/scalable/giggle-history-view.png
similarity index 100%
rename from pixmaps/scalable/giggle-history-view.png
rename to data/icons/scalable/giggle-history-view.png
diff --git a/pixmaps/scalable/giggle-history-view.svg b/data/icons/scalable/giggle-history-view.svg
similarity index 100%
rename from pixmaps/scalable/giggle-history-view.svg
rename to data/icons/scalable/giggle-history-view.svg
diff --git a/pixmaps/scalable/giggle.svg b/data/icons/scalable/giggle.svg
similarity index 100%
rename from pixmaps/scalable/giggle.svg
rename to data/icons/scalable/giggle.svg