[gimp] data: sort patterns into subdirectories so they get tagged automatically

From: Michael Natterer <mitch src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp] data: sort patterns into subdirectories so they get tagged automatically
Date: Wed, 11 Feb 2015 20:14:03 +0000 (UTC)
commit d1f8fa01a8a3ca2abf1116ef9ae423d125eb3bf0
Author: Michael Natterer <mitch gimp org>
Date:   Tue Feb 10 10:46:52 2015 +0100

    data: sort patterns into subdirectories so they get tagged automatically
    
    This does not mean that our patterns are all of a sudden "proper" now,
    but the categories (except "Legacy") hopefully make sense for new high
    quality patterns that will be added, and it's better than having them
    all untagged.

 configure.ac                               |   10 ++++
 data/patterns/Animal/Makefile.am           |   10 ++++
 data/patterns/{ => Animal}/leather.pat     |  Bin 12320 -> 12320 bytes
 data/patterns/{ => Animal}/leopard.pat     |  Bin 11936 -> 11936 bytes
 data/patterns/Fabric/.gitignore            |    2 +
 data/patterns/Fabric/Makefile.am           |    8 +++
 data/patterns/{ => Fabric}/burlap.pat      |  Bin 27679 -> 27679 bytes
 data/patterns/Food/Makefile.am             |    9 +++
 data/patterns/{ => Food}/choc_swirl.pat    |  Bin 7540 -> 7540 bytes
 data/patterns/{ => Food}/java.pat          |  Bin 12317 -> 12317 bytes
 data/patterns/{ => Legacy}/3dgreen.pat     |  Bin 6108 -> 6108 bytes
 data/patterns/Legacy/Makefile.am           |   22 ++++++++
 data/patterns/{ => Legacy}/Stripes1px.pat  |  Bin 9253 -> 9253 bytes
 data/patterns/{ => Legacy}/Stripes2px.pat  |  Bin 9248 -> 9248 bytes
 data/patterns/{ => Legacy}/blue.pat        |  Bin 6108 -> 6108 bytes
 data/patterns/{ => Legacy}/bluegrid.pat    |  Bin 1909 -> 1909 bytes
 data/patterns/{ => Legacy}/bluesquares.pat |  Bin 48037 -> 48037 bytes
 data/patterns/{ => Legacy}/blueweb.pat     |  Bin 12321 -> 12321 bytes
 data/patterns/{ => Legacy}/fibers.pat      |  Bin 7531 -> 7531 bytes
 data/patterns/{ => Legacy}/nops.pat        |  Bin 49181 -> 49181 bytes
 data/patterns/{ => Legacy}/pastel.pat      |  Bin 12325 -> 12325 bytes
 data/patterns/{ => Legacy}/qube1.pat       |  Bin 5331 -> 5331 bytes
 data/patterns/{ => Legacy}/recessed.pat    |  Bin 6433 -> 6433 bytes
 data/patterns/{ => Legacy}/redcube.pat     |  Bin 12322 -> 12322 bytes
 data/patterns/{ => Legacy}/sm_squares.pat  |  Bin 7538 -> 7538 bytes
 data/patterns/{ => Legacy}/warning.pat     |  Bin 1233 -> 1233 bytes
 data/patterns/Makefile.am                  |   74 ++++-----------------------
 data/patterns/Paper/.gitignore             |    2 +
 data/patterns/Paper/Makefile.am            |    9 +++
 data/patterns/{ => Paper}/crinklepaper.pat |  Bin 49191 -> 49191 bytes
 data/patterns/{ => Paper}/paper.pat        |  Bin 10030 -> 10030 bytes
 data/patterns/Plant/Makefile.am            |    8 +++
 data/patterns/{ => Plant}/leaves.pat       |  Bin 7537 -> 7537 bytes
 data/patterns/Sky/Makefile.am              |   11 ++++
 data/patterns/{ => Sky}/lightning.pat      |  Bin 40723 -> 40723 bytes
 data/patterns/{ => Sky}/sky.pat            |  Bin 11002 -> 11002 bytes
 data/patterns/{ => Sky}/starfield.pat      |  Bin 49186 -> 49186 bytes
 data/patterns/Stone/.gitignore             |    2 +
 data/patterns/{ => Stone}/Craters.pat      |  Bin 39707 -> 39707 bytes
 data/patterns/Stone/Makefile.am            |   22 ++++++++
 data/patterns/{ => Stone}/Moonfoot.pat     |  Bin 14442 -> 14442 bytes
 data/patterns/{ => Stone}/amethyst.pat     |  Bin 12321 -> 12321 bytes
 data/patterns/{ => Stone}/brick.pat        |  Bin 27679 -> 27679 bytes
 data/patterns/{ => Stone}/cracked.pat      |  Bin 62238 -> 62238 bytes
 data/patterns/{ => Stone}/granite1.pat     |  Bin 10035 -> 10035 bytes
 data/patterns/{ => Stone}/ground1.pat      |  Bin 30034 -> 30034 bytes
 data/patterns/{ => Stone}/marble1.pat      |  Bin 16418 -> 16418 bytes
 data/patterns/{ => Stone}/marble2.pat      |  Bin 16418 -> 16418 bytes
 data/patterns/{ => Stone}/marble3.pat      |  Bin 12322 -> 12322 bytes
 data/patterns/{ => Stone}/pink_marble.pat  |  Bin 49188 -> 49188 bytes
 data/patterns/{ => Stone}/rock.pat         |  Bin 30510 -> 30510 bytes
 data/patterns/{ => Stone}/slate.pat        |  Bin 16414 -> 16414 bytes
 data/patterns/{ => Stone}/stone33.pat      |  Bin 73038 -> 73038 bytes
 data/patterns/{ => Stone}/terra.pat        |  Bin 12318 -> 12318 bytes
 data/patterns/Water/.gitignore             |    2 +
 data/patterns/Water/Makefile.am            |   11 ++++
 data/patterns/{ => Water}/electric.pat     |  Bin 9638 -> 9638 bytes
 data/patterns/{ => Water}/ice.pat          |  Bin 43228 -> 43228 bytes
 data/patterns/{ => Water}/pool.pat         |  Bin 6111 -> 6111 bytes
 data/patterns/{ => Water}/rain.pat         |  Bin 35021 -> 35021 bytes
 data/patterns/Wood/.gitignore              |    2 +
 data/patterns/Wood/Makefile.am             |   20 ++++++++
 data/patterns/{ => Wood}/bark.pat          |  Bin 22174 -> 22174 bytes
 data/patterns/{ => Wood}/burlwood.pat      |  Bin 27681 -> 27681 bytes
 data/patterns/{ => Wood}/corkboard.pat     |  Bin 10097 -> 10097 bytes
 data/patterns/{ => Wood}/parque1.pat       |  Bin 12322 -> 12322 bytes
 data/patterns/{ => Wood}/parque2.pat       |  Bin 12322 -> 12322 bytes
 data/patterns/{ => Wood}/parque3.pat       |  Bin 12322 -> 12322 bytes
 data/patterns/{ => Wood}/pine.pat          |  Bin 10781 -> 10781 bytes
 data/patterns/{ => Wood}/walnut.pat        |  Bin 49183 -> 49183 bytes
 data/patterns/{ => Wood}/wood1.pat         |  Bin 27690 -> 27690 bytes
 data/patterns/{ => Wood}/wood2.pat         |  Bin 30030 -> 30030 bytes
 data/patterns/{ => Wood}/wood3.pat         |  Bin 7532 -> 7532 bytes
 data/patterns/{ => Wood}/wood4.pat         |  Bin 7532 -> 7532 bytes
 data/patterns/{ => Wood}/wood5.pat         |  Bin 27677 -> 27677 bytes
 75 files changed, 161 insertions(+), 63 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 88a8e6e..9d9334a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2338,6 +2338,16 @@ data/images/Makefile
 data/interpreters/Makefile
 data/palettes/Makefile
 data/patterns/Makefile
+data/patterns/Animal/Makefile
+data/patterns/Fabric/Makefile
+data/patterns/Food/Makefile
+data/patterns/Legacy/Makefile
+data/patterns/Paper/Makefile
+data/patterns/Plant/Makefile
+data/patterns/Sky/Makefile
+data/patterns/Stone/Makefile
+data/patterns/Water/Makefile
+data/patterns/Wood/Makefile
 data/tags/Makefile
 data/tips/Makefile
 data/tool-presets/Makefile
diff --git a/data/patterns/Animal/Makefile.am b/data/patterns/Animal/Makefile.am
new file mode 100644
index 0000000..62e4328
--- /dev/null
+++ b/data/patterns/Animal/Makefile.am
@@ -0,0 +1,10 @@
+## Makefile.am for gimp/data/patterns/Animal
+
+patternsanimaldatadir = $(gimpdatadir)/patterns/Animal
+
+patternsanimaldata_DATA = \
+       leather.pat             \
+       leopard.pat
+
+
+EXTRA_DIST = $(patternsanimaldata_DATA)
diff --git a/data/patterns/Fabric/.gitignore b/data/patterns/Fabric/.gitignore
new file mode 100644
index 0000000..9ee6454
--- /dev/null
+++ b/data/patterns/Fabric/.gitignore
@@ -0,0 +1,2 @@
+/Makefile.in
+/Makefile
diff --git a/data/patterns/Fabric/Makefile.am b/data/patterns/Fabric/Makefile.am
new file mode 100644
index 0000000..5fae576
--- /dev/null
+++ b/data/patterns/Fabric/Makefile.am
@@ -0,0 +1,8 @@
+## Makefile.am for gimp/data/patterns/Fabric
+
+patternsfabricdatadir = $(gimpdatadir)/patterns/Fabric
+
+patternsfabricdata_DATA = \
+       burlap.pat
+
+EXTRA_DIST = $(patternsfabricdata_DATA)
diff --git a/data/patterns/Food/Makefile.am b/data/patterns/Food/Makefile.am
new file mode 100644
index 0000000..6baf4ba
--- /dev/null
+++ b/data/patterns/Food/Makefile.am
@@ -0,0 +1,9 @@
+## Makefile.am for gimp/data/patterns/Food
+
+patternsfooddatadir = $(gimpdatadir)/patterns/Food
+
+patternsfooddata_DATA = \
+       choc_swirl.pat          \
+       java.pat
+
+EXTRA_DIST = $(patternsfooddata_DATA)
diff --git a/data/patterns/Legacy/Makefile.am b/data/patterns/Legacy/Makefile.am
new file mode 100644
index 0000000..c65b649
--- /dev/null
+++ b/data/patterns/Legacy/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for gimp/data/patterns/Legacy
+
+patternslegacydatadir = $(gimpdatadir)/patterns/Legacy
+
+patternslegacydata_DATA = \
+       3dgreen.pat             \
+       Stripes1px.pat          \
+       Stripes2px.pat          \
+       blue.pat                \
+       bluegrid.pat            \
+       bluesquares.pat         \
+       blueweb.pat             \
+       fibers.pat              \
+       nops.pat                \
+       pastel.pat              \
+       qube1.pat               \
+       recessed.pat            \
+       redcube.pat             \
+       sm_squares.pat          \
+       warning.pat
+
+EXTRA_DIST = $(patternslegacydata_DATA)
diff --git a/data/patterns/Makefile.am b/data/patterns/Makefile.am
index 679ca38..565e262 100644
--- a/data/patterns/Makefile.am
+++ b/data/patterns/Makefile.am
@@ -1,65 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-patterndatadir = $(gimpdatadir)/patterns
-
-patterndata_DATA = \
-       3dgreen.pat             \
-       Craters.pat             \
-       Moonfoot.pat            \
-       Stripes1px.pat          \
-       Stripes2px.pat          \
-       amethyst.pat            \
-       bark.pat                \
-       blue.pat                \
-       bluegrid.pat            \
-       bluesquares.pat         \
-       blueweb.pat             \
-       brick.pat               \
-       burlap.pat              \
-       burlwood.pat            \
-       choc_swirl.pat          \
-       corkboard.pat           \
-       cracked.pat             \
-       crinklepaper.pat        \
-       electric.pat            \
-       fibers.pat              \
-       granite1.pat            \
-       ground1.pat             \
-       ice.pat                 \
-       java.pat                \
-       leather.pat             \
-       leaves.pat              \
-       leopard.pat             \
-       lightning.pat           \
-       marble1.pat             \
-       marble2.pat             \
-       marble3.pat             \
-       nops.pat                \
-       paper.pat               \
-       parque1.pat             \
-       parque2.pat             \
-       parque3.pat             \
-       pastel.pat              \
-       pine.pat                \
-       pink_marble.pat         \
-       pool.pat                \
-       qube1.pat               \
-       rain.pat                \
-       recessed.pat            \
-       redcube.pat             \
-       rock.pat                \
-       sky.pat                 \
-       slate.pat               \
-       sm_squares.pat          \
-       starfield.pat           \
-       stone33.pat             \
-       terra.pat               \
-       walnut.pat              \
-       warning.pat             \
-       wood1.pat               \
-       wood2.pat               \
-       wood3.pat               \
-       wood4.pat               \
-       wood5.pat
-
-EXTRA_DIST = $(patterndata_DATA)
+SUBDIRS = \
+       Animal  \
+       Fabric  \
+       Food    \
+       Legacy  \
+       Paper   \
+       Plant   \
+       Sky     \
+       Stone   \
+       Water   \
+       Wood
diff --git a/data/patterns/Paper/.gitignore b/data/patterns/Paper/.gitignore
new file mode 100644
index 0000000..9ee6454
--- /dev/null
+++ b/data/patterns/Paper/.gitignore
@@ -0,0 +1,2 @@
+/Makefile.in
+/Makefile
diff --git a/data/patterns/Paper/Makefile.am b/data/patterns/Paper/Makefile.am
new file mode 100644
index 0000000..a567700
--- /dev/null
+++ b/data/patterns/Paper/Makefile.am
@@ -0,0 +1,9 @@
+## Makefile.am for gimp/data/patterns/Paper
+
+patternpaperdatadir = $(gimpdatadir)/patterns/Paper
+
+patternpaperdata_DATA = \
+       crinklepaper.pat        \
+       paper.pat
+
+EXTRA_DIST = $(patternpaperdata_DATA)
diff --git a/data/patterns/Plant/Makefile.am b/data/patterns/Plant/Makefile.am
new file mode 100644
index 0000000..7932f57
--- /dev/null
+++ b/data/patterns/Plant/Makefile.am
@@ -0,0 +1,8 @@
+## Makefile.am for gimp/data/patterns/Plant
+
+patternsplantdatadir = $(gimpdatadir)/patterns/Plant
+
+patternsplantdata_DATA = \
+       leaves.pat
+
+EXTRA_DIST = $(patternsplantdata_DATA)
diff --git a/data/patterns/Sky/Makefile.am b/data/patterns/Sky/Makefile.am
new file mode 100644
index 0000000..a597c5f
--- /dev/null
+++ b/data/patterns/Sky/Makefile.am
@@ -0,0 +1,11 @@
+## Makefile.am for gimp/data/patterns/Sky
+
+patternsskydatadir = $(gimpdatadir)/patterns/Sky
+
+patternsskydata_DATA = \
+       lightning.pat           \
+       sky.pat                 \
+       starfield.pat
+
+
+EXTRA_DIST = $(patternsskydata_DATA)
diff --git a/data/patterns/Stone/.gitignore b/data/patterns/Stone/.gitignore
new file mode 100644
index 0000000..9ee6454
--- /dev/null
+++ b/data/patterns/Stone/.gitignore
@@ -0,0 +1,2 @@
+/Makefile.in
+/Makefile
diff --git a/data/patterns/Stone/Makefile.am b/data/patterns/Stone/Makefile.am
new file mode 100644
index 0000000..90a78bc
--- /dev/null
+++ b/data/patterns/Stone/Makefile.am
@@ -0,0 +1,22 @@
+## Makefile.am for gimp/data/patterns/Stone
+
+patternsstonedatadir = $(gimpdatadir)/patterns/Stone
+
+patternsstonedata_DATA = \
+       Craters.pat             \
+       Moonfoot.pat            \
+       amethyst.pat            \
+       brick.pat               \
+       cracked.pat             \
+       granite1.pat            \
+       ground1.pat             \
+       pink_marble.pat         \
+       marble1.pat             \
+       marble2.pat             \
+       marble3.pat             \
+       rock.pat                \
+       slate.pat               \
+       stone33.pat             \
+       terra.pat
+
+EXTRA_DIST = $(patternsstonedata_DATA)
diff --git a/data/patterns/Water/.gitignore b/data/patterns/Water/.gitignore
new file mode 100644
index 0000000..9ee6454
--- /dev/null
+++ b/data/patterns/Water/.gitignore
@@ -0,0 +1,2 @@
+/Makefile.in
+/Makefile
diff --git a/data/patterns/Water/Makefile.am b/data/patterns/Water/Makefile.am
new file mode 100644
index 0000000..d8a0c03
--- /dev/null
+++ b/data/patterns/Water/Makefile.am
@@ -0,0 +1,11 @@
+## Makefile.am for gimp/data/patterns/Water
+
+patternwaterdatadir = $(gimpdatadir)/patterns/Water
+
+patternwaterdata_DATA = \
+       electric.pat            \
+       ice.pat                 \
+       pool.pat                \
+       rain.pat
+
+EXTRA_DIST = $(patternwaterdata_DATA)
diff --git a/data/patterns/Wood/.gitignore b/data/patterns/Wood/.gitignore
new file mode 100644
index 0000000..9ee6454
--- /dev/null
+++ b/data/patterns/Wood/.gitignore
@@ -0,0 +1,2 @@
+/Makefile.in
+/Makefile
diff --git a/data/patterns/Wood/Makefile.am b/data/patterns/Wood/Makefile.am
new file mode 100644
index 0000000..17f0875
--- /dev/null
+++ b/data/patterns/Wood/Makefile.am
@@ -0,0 +1,20 @@
+## Makefile.am for gimp/data/patterns/Wood
+
+patternswooddatadir = $(gimpdatadir)/patterns/Wood
+
+patternswooddata_DATA = \
+       bark.pat                \
+       burlwood.pat            \
+       corkboard.pat           \
+       parque1.pat             \
+       parque2.pat             \
+       parque3.pat             \
+       pine.pat                \
+       walnut.pat              \
+       wood1.pat               \
+       wood2.pat               \
+       wood3.pat               \
+       wood4.pat               \
+       wood5.pat
+
+EXTRA_DIST = $(patternswooddata_DATA)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]