data: More resource updates and cleanup with Ramon

configure.ac

@@ -2254,7 +2254,9 @@ themes/Small/Makefile
 data/Makefile
 data/brushes/Makefile
 data/brushes/Basic/Makefile
+data/brushes/gimp-obsolete-files/Makefile
 data/brushes/Media/Makefile
+data/brushes/Legacy/Makefile
 data/brushes/Sketch/Makefile
 data/brushes/Splatters/Makefile
 data/brushes/Texture/Makefile

data/brushes/Basic/1-pixel.vbr

@@ -1,6 +1,6 @@
 GIMP-VBR
 1.5
-1_Pixel
+0_Pixel
 square
 20.000000
 1.000000

data/brushes/Basic/Block-01.vbr

@@ -1,6 +1,6 @@
 GIMP-VBR
 1.5
-Block_01
+1_Block_01
 square
 10.000000
 25.000000

data/brushes/Basic/Block-02.vbr

@@ -1,6 +1,6 @@
 GIMP-VBR
 1.0
-Block_02
+1_Block_02
 10.000000
 25.000000
 0.750000

data/brushes/Basic/Block-03.vbr

@@ -1,6 +1,6 @@
 GIMP-VBR
 1.0
-Block 03
+1_Block 03
 10.000000
 25.000000
 0.950000

data/brushes/Basic/Hardness-025.vbr

@@ -1,6 +1,6 @@
 GIMP-VBR
 1.0
-Hardness 025
+1_Hardness 025 #1
 5.000000
 25.000000
 0.250000

data/brushes/Basic/Hardness-050.vbr

@@ -1,6 +1,6 @@
 GIMP-VBR
 1.0
-Hardness 050
+1_Hardness 050
 10.000000
 25.000000
 0.500000

data/brushes/Basic/Hardness-075.vbr

@@ -1,6 +1,6 @@
 GIMP-VBR
 1.0
-Hardness 075
+1_Hardness 075
 10.000000
 25.000000
 0.750000

data/brushes/Basic/Hardness-100.vbr

@@ -1,6 +1,6 @@
 GIMP-VBR
 1.0
-Hardness 100
+1_Hardness 100
 10.000000
 25.000000
 1.000000

data/brushes/Basic/Makefile.am

@@ -3,14 +3,14 @@
 brushbasicdatadir = $(gimpdatadir)/brushes/Basic
 
 brushbasicdata_DATA = \
-	1_pixel.vbr		\
-	Block_01.vbr		\
-	Block_02.vbr		\
-	Block_03.vbr		\
-	Hardness_025.vbr	\
-	Hardness_050.vbr	\
-	Hardness_075.vbr	\
-	Hardness_100.vbr	\
+	1-pixel.vbr		\
+	Block-01.vbr		\
+	Block-02.vbr		\
+	Block-03.vbr		\
+	Hardness-025.vbr	\
+	Hardness-050.vbr	\
+	Hardness-075.vbr	\
+	Hardness-100.vbr	\
 	Star.vbr
 
 EXTRA_DIST = $(brushbasicdata_DATA)

data/brushes/Basic/Star.vbr

@@ -1,6 +1,6 @@
 GIMP-VBR
 1.5
-Star
+1_Star
 diamond
 50.000000
 25.000000

data/brushes/Calligraphic.vbr

@@ -1,8 +0,0 @@
-GIMP-VBR
-1.0
-Calligraphic
-20.000000
-50.000000
-1.000000
-5.265306
-45.000000

data/brushes/Legacy/.gitignore

@@ -0,0 +1,2 @@
+/Makefile.in
+/Makefile

data/brushes/Legacy/Makefile.am

@@ -0,0 +1,15 @@
+## Makefile.am for gimp/data/brushes/Legacy
+
+brushlegacydatadir = $(gimpdatadir)/brushes/Legacy
+
+brushlegacydata_DATA = \
+	confetti.gbr	\
+	confetti.gih	\
+	dunes.gbr	\
+	galaxy-big.gbr	\
+	galaxy.gbr	\
+	pepper.gbr	\
+	vine.gih
+
+
+EXTRA_DIST = $(brushmlegacydata_DATA)

data/brushes/Makefile.am

@@ -1,69 +1,11 @@
 ## Makefile.am for gimp/data/brushes
 
-brushdatadir = $(gimpdatadir)/brushes
-obsoletebrushdatadir = $(gimpdatadir)/brushes/gimp-obsolete-files
-
 SUBDIRS = \
-	Basic		\
-	Media		\
-	Sketch		\
-	Splatters	\
+	Basic			\
+	gimp-obsolete-files	\
+	Media			\
+	Legacy			\
+	Sketch			\
+	Splatters		\
 	Texture
 
-brushdata_DATA = \
-	confetti.gbr			\
-	dunes.gbr			\
-	galaxy.gbr			\
-	galaxy_big.gbr			\
-	pepper.gbr			\
-	pixel.gbr			\
-	\
-	Calligraphic.vbr		\
-	\
-	Grass1.gih			\
-	confetti.gih			\
-	vine.gih
-
-obsoletebrushdata_DATA = \
-	10x10square.gbr			\
-	10x10squareBlur.gbr		\
-	20x20square.gbr			\
-	20x20squareBlur.gbr		\
-	5x5square.gbr			\
-	5x5squareBlur.gbr		\
-	galaxy_small.gbr		\
-	\
-	Calligraphic-Brush-0.vbr	\
-	Calligraphic-Brush-1.vbr	\
-	Calligraphic-Brush-2.vbr	\
-	Calligraphic-Brush-3.vbr	\
-	Circle-1.vbr			\
-	Circle-3.vbr			\
-	Circle-5.vbr			\
-	Circle-7.vbr			\
-	Circle-9.vbr			\
-	Circle-11.vbr			\
-	Circle-13.vbr			\
-	Circle-15.vbr			\
-	Circle-17.vbr			\
-	Circle-19.vbr			\
-	Circle-Fuzzy-3.vbr		\
-	Circle-Fuzzy-5.vbr		\
-	Circle-Fuzzy-7.vbr		\
-	Circle-Fuzzy-9.vbr		\
-	Circle-Fuzzy-11.vbr		\
-	Circle-Fuzzy-13.vbr		\
-	Circle-Fuzzy-15.vbr		\
-	Circle-Fuzzy-17.vbr		\
-	Circle-Fuzzy-19.vbr		\
-	Diagonal-Star-11.vbr		\
-	Diagonal-Star-17.vbr		\
-	Diagonal-Star-25.vbr		\
-	feltpen.gih			\
-	\
-	SketchBrush-16.gih		\
-	SketchBrush-32.gih		\
-	SketchBrush-64.gih
-
-
-EXTRA_DIST = $(brushdata_DATA) $(obsoletebrushdata_DATA)

data/brushes/Media/Makefile.am

@@ -3,16 +3,16 @@
 brushmediadatadir = $(gimpdatadir)/brushes/Media
 
 brushmediadata_DATA = \
-	Acrylic_01.gih	\
-	Acrylic_02.gih	\
-	Acrylic_03.gih	\
-	Acrylic_04.gih	\
-	Acrylic_05.gih	\
-	Bristles_01.gbr	\
-	Bristles_02.gbr	\
-	Bristles_03.gbr	\
-	Oils_01.gbr	\
-	Oils_02.gbr	\
-	Oils_03.gbr
+	Acrylic-01.gih	\
+	Acrylic-02.gih	\
+	Acrylic-03.gih	\
+	Acrylic-04.gih	\
+	Acrylic-05.gih	\
+	Bristles-01.gbr	\
+	Bristles-02.gbr	\
+	Bristles-03.gbr	\
+	Oils-01.gbr	\
+	Oils-02.gbr	\
+	Oils-03.gbr
 
 EXTRA_DIST = $(brushmediadata_DATA)

data/brushes/Sketch/Makefile.am

@@ -3,13 +3,13 @@
 brushsketchdatadir = $(gimpdatadir)/brushes/Sketch
 
 brushsketchdata_DATA = \
-	Chalk_01.gih		\
-	Chalk_02.gih		\
-	Chalk_03.gih		\
-	Charcoal_01.gbr		\
-	Charcoal_02.gbr		\
-	Pencil_01.gih		\
-	Pencil_02.gih		\
-	Pencil_Scratch.gbr
+	Chalk-01.gih		\
+	Chalk-02.gih		\
+	Chalk-03.gih		\
+	Charcoal-01.gbr		\
+	Charcoal-02.gbr		\
+	Pencil-01.gih		\
+	Pencil-02.gih		\
+	Pencil-Scratch.gbr
 
 EXTRA_DIST = $(brushsketchdata_DATA)

data/brushes/Splatters/Makefile.am

@@ -3,10 +3,10 @@
 brushsplattersdatadir = $(gimpdatadir)/brushes/Splatters
 
 brushsplattersdata_DATA = \
-	Sparks_Hose.gih	\
-	Splats_01.gih	\
-	Splats_02.gih	\
-	Sponge_01.gbr	\
-	Sponge_02.gbr
+	Sparks-Hose.gih	\
+	Splats-01.gih	\
+	Splats-02.gih	\
+	Sponge-01.gbr	\
+	Sponge-02.gbr
 
 EXTRA_DIST = $(brushsplattersdata_DATA)

data/brushes/Texture/Makefile.am

@@ -3,16 +3,17 @@
 brushtexturedatadir = $(gimpdatadir)/brushes/Texture
 
 brushtexturedata_DATA = \
-	Cell_01.gbr		\
-	Cell_02.gbr		\
+	Cell-01.gbr		\
+	Cell-02.gbr		\
+	Grass.gih		\
 	Smoke.gbr		\
 	Structure.gbr		\
-	Texture_01.gbr		\
-	Texture_02.gbr		\
-	Texture_Hose_01.gih	\
-	Texture_Hose_02.gih	\
-	Texture_Hose_03.gih	\
-	Vegetation_01.gbr	\
-	Vegetation_02.gih
+	Texture-01.gbr		\
+	Texture-02.gbr		\
+	Texture-Hose-01.gih	\
+	Texture-Hose-02.gih	\
+	Texture-Hose-03.gih	\
+	Vegetation-01.gbr	\
+	Vegetation-02.gih
 
 EXTRA_DIST = $(brushtexturedata_DATA)

data/brushes/gimp-obsolete-files/.gitignore

@@ -0,0 +1,2 @@
+/Makefile.in
+/Makefile

data/brushes/gimp-obsolete-files/Makefile.am

@@ -0,0 +1,57 @@
+## Makefile.am for gimp/data/brushes/brushes/gimp-obsolete-files
+
+obsoletebrushdatadir = $(gimpdatadir)/brushes/gimp-obsolete-files
+
+obsoletebrushdata_DATA = \
+	10x10square.gbr			\
+	10x10squareBlur.gbr		\
+	20x20square.gbr			\
+	20x20squareBlur.gbr		\
+	5x5square.gbr			\
+	5x5squareBlur.gbr		\
+	confetti.gih			\
+	confetti.gbr			\
+	dunes.gbr			\
+	galaxy.gbr			\
+	galaxy_big.gbr			\
+	galaxy_small.gbr		\
+	\
+	Calligraphic-Brush-0.vbr	\
+	Calligraphic-Brush-1.vbr	\
+	Calligraphic-Brush-2.vbr	\
+	Calligraphic-Brush-3.vbr	\
+	Circle-1.vbr			\
+	Circle-3.vbr			\
+	Circle-5.vbr			\
+	Circle-7.vbr			\
+	Circle-9.vbr			\
+	Circle-11.vbr			\
+	Circle-13.vbr			\
+	Circle-15.vbr			\
+	Circle-17.vbr			\
+	Circle-19.vbr			\
+	Circle-Fuzzy-3.vbr		\
+	Circle-Fuzzy-5.vbr		\
+	Circle-Fuzzy-7.vbr		\
+	Circle-Fuzzy-9.vbr		\
+	Circle-Fuzzy-11.vbr		\
+	Circle-Fuzzy-13.vbr		\
+	Circle-Fuzzy-15.vbr		\
+	Circle-Fuzzy-17.vbr		\
+	Circle-Fuzzy-19.vbr		\
+	Diagonal-Star-11.vbr		\
+	Diagonal-Star-17.vbr		\
+	Diagonal-Star-25.vbr		\
+	feltpen.gih			\
+	\
+	SketchBrush-16.gih		\
+	SketchBrush-32.gih		\
+	SketchBrush-64.gih		\
+	pepper.gbr			\
+	pixel.gbr			\
+	\
+	Grass1.gih			\
+	vine.gih
+
+
+EXTRA_DIST = $(obsoletebrushdata_DATA)