Wed Jun 13 21:13:51 PDT 2001 Michael Jennings <mej@eterm.org>

	There is now a new mechanism for dealing with the background image
	collection, including a new update script.  Please read the newly-
	rewritten bg/README.backgrounds for details.

	Also, I'm trying to flesh out the Contributors list in that file, but
	my memory isn't cooperating.  So if you contributed one of the
	backgrounds, or know someone who did, please let me know.


SVN revision: 4810

3 files changed, 69 insertions, 69 deletions

diff --git a/bg/Makefile.am b/bg/Makefile.am
index e7b5927..16c292a 100644
--- a/bg/Makefile.am
+++ b/bg/Makefile.am
@@ -1,49 +1,19 @@
 # $Id$
 
 DIRS = tile scale
-EXTRA_DIST =  tile/014.jpg tile/circuit.jpg tile/giger1.jpg tile/40.jpg tile/blackstone.jpg \
-              tile/nebula.jpg scale/Dragon.jpg \
+UPDATE_SCRIPT = @top_srcdir@/utils/Etbg_update_list
+
+EXTRA_DIST =  tile/014.jpg tile/circuit.jpg tile/giger1.jpg tile/40.jpg tile/blackstone.jpg tile/nebula.jpg \
               README.backgrounds
 pixmapdir = $(pkgdatadir)/pix
 themedir = $(pkgdatadir)/themes
 
-all: Makefile
-	@echo "*** Generating pixmap list files from images in tile/ and scale/..."
-	@true > $(srcdir)/pixmaps.list
-	@true > $(srcdir)/tile/tiled-pixmaps.list
-	@true > $(srcdir)/scale/scaled-pixmaps.list
-	@for i in `(cd $(srcdir)/tile && ls -1 | grep -v CVS | grep -v \.cvsignore | grep -v pixmaps.list)` ; do \
-	  echo $$i >> $(srcdir)/tile/tiled-pixmaps.list ; \
-	  echo '"'$$i'@0x0+0+0:tile"' >> $(srcdir)/pixmaps.list ; \
-	done
-	@for i in `(cd $(srcdir)/scale && ls -1 | grep -v CVS | grep -v \.cvsignore | grep -v pixmaps.list)` ; do \
-	  echo $$i >> $(srcdir)/scale/scaled-pixmaps.list ; \
-	  echo '"'$$i'@100x100"' >> $(srcdir)/pixmaps.list ; \
-	done
-
 install-data-hook:
-	@if test ! -f $(srcdir)/pixmaps.list ; then $(MAKE) all ; fi
-	$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
-	@(for j in $(DIRS) ; do echo "Installing pixmaps in $$j" ; cd $(srcdir)/$$j ; \
-	  for i in `ls -1 | grep -v CVS | grep -v \.cvsignore | grep -v pixmaps.list` ; do \
-	    echo $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir} ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir} ; \
+	@(for j in $(DIRS) ; do echo "Installing pixmaps in $$j" ; \
+	  $(mkinstalldirs) $(DESTDIR)$(pixmapdir)/$$j ; cd $(srcdir)/$$j ; \
+	  for i in `ls -1 | grep -v CVS | grep -v \.cvsignore` ; do \
+	    echo $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir}/$$j/ ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)${pixmapdir}/$$j/ ; \
 	  done ; cd .. ; \
 	done)
-	@for i in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \
-          if test -f $(DESTDIR)${pixmapdir}/$$i ; then \
-	    $(CP) -p $(DESTDIR)${pixmapdir}/$$i $(DESTDIR)${pixmapdir}/$$i.old ; \
-	    echo "WARNING:  Backup of existing $$i created." ; \
-	  fi ; \
-	done
-	$(INSTALL_DATA) $(srcdir)/tile/tiled-pixmaps.list $(DESTDIR)${pixmapdir}
-	$(INSTALL_DATA) $(srcdir)/scale/scaled-pixmaps.list $(DESTDIR)${pixmapdir}
-	$(INSTALL_DATA) $(srcdir)/pixmaps.list $(DESTDIR)${pixmapdir}
-	@for i in `ls -1d $(DESTDIR)${themedir}/*` ; do \
-	  for j in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \
-	    if test $$i != "." -a $$i != ".." -a ! -f $$i/$$j ; then \
-	      echo "$(LN_S) ../../pix/$$j $$i/$$j" ; \
-	      $(LN_S) ../../pix/$$j $$i/$$j ; \
-	    fi ; \
-	  done ; \
-	done
+	$(UPDATE_SCRIPT) $(DESTDIR)${pixmapdir}
diff --git a/bg/README.backgrounds b/bg/README.backgrounds
index b688181..78696d0 100644
--- a/bg/README.backgrounds
+++ b/bg/README.backgrounds
@@ -1,34 +1,64 @@
-Eterm Background Archive
-========================
-
-This is the official (<G>) collection of Eterm background images.  The only
-things that make it official are (1) I put it together, and (2) the default
-themes that come with Eterm are designed to work with these images.  NONE of
-these images are original work by either of the Eterm authors; they have all
-been collected from various sites on the web.  As far as I know, they are all
-freely available for use.
-
-However, should any person who can provide proof of ownership of any of these
-pictures object to their inclusion, they will be IMMEDIATELY withdrawn.  No
-copyright infringement is intended.  Inclusion here should be taken as a
-compliment. :-)
-
-Installation
-------------
+Eterm Background Images
+=======================
+
+The default themes for Eterm are designed to select a background image
+at random.  In order for this to work, some sort of mechanism had to
+be created for the creation and maintenance of a set of backgrounds,
+both tileable and scaled.  This mechanism had to allow for easy
+selection of the random image as well as easy alterations to the
+collection.
+
+So here's how it works.  Underneath this directory (bg/) you'll find
+two subdirectories:  tile and scale.  These directories contain tiled
+and scaled background images, respectively.  When "make install" is
+run, these images are automatically installed in directories with the
+same names underneath <prefix>/share/Eterm/pix/.  Once these images
+have been copied into place, the Etbg_update_list utility is run to
+create or update the pixmaps.list file, a text file containing the
+master list of images and their geometries, from which Eterm will
+choose an image at random.
+
+If you wish to add or remove images from the collection, first cd into
+<prefix>/share/Eterm/pix/.  Once there, remove any unwanted images
+from the tile/ and/or scale/ directories.  Then copy any images you
+want into either the tile/ or scale/ directory, depending on whether
+you want Eterm to tile the image or scale it.  When you have finished
+adding and/or removing images, run the Etbg_update_list script again
+(it is found in <prefix>/bin/) to update the list.
+
+You may have as many or as few images in your collection as you like;
+just remember to re-run the Etbg_update_list script after completing
+each set of changes.  Note that if you have fewer than 2 images in the
+collection, you should edit the theme.cfg file for your theme to
+deactivate the random image selection.  (If you neglect to do this,
+you may receive error messages from Eterm, but it will continue to
+function.)
 
-Now that this is included with the Eterm distribution, these images will be
-cataloged and installed as part of the normal Eterm build process.
 
-Changes
--------
+Disclaimer
+----------
+
+All images distributed with Eterm itself, and all those in the
+supplementary backgrounds collection, were downloaded freely from the
+Internet or submitted directly via e-mail by their authors.  None of
+these images are original work by me.  Furthermore, I have made every
+effort to ensure that the ones I downloaded are freely distributable.
+
+However, should any person who can provide proof of ownership of any
+of these pictures object to their inclusion, they will be IMMEDIATELY
+withdrawn.  No copyright infringement is intended.  Inclusion here
+should be taken as a compliment. :-)
+
+
+Contributors
+------------
 
-Adding pictures to the archive is equally simple.  If the picture is intended
-to be tiled, copy it into the "tile" directory.  If it is intended to be scaled
-(i.e., non-tileable pictures), copy it into the "scale" directory.  Then re-run
-"make" and "make install".  That's it!  The images will automatically be
-included in Eterm's random rotation.
+The following contributions have been made by their authors.  Thanks
+to all who have contributed.  If one of your images is in this
+collection, but it isn't reflected here, please e-mail me
+(mej@eterm.org) so I can correct the omission.  Note that some of
+these images are included with the supplemental backgrounds collection
+rather than with the Eterm distribution.
 
-Removing pictures is done the same way.  Simply remove them from whichever
-directory they reside in, then re-run "make" and "make install".  You will need
-to manually remove the file from the pixmap directory if you so desire; these
-instructions only pertain to changing the standard rotation.
+Neopolis-horizon.jpg		Joe Colburn <joe@nodomain.com>
+cyber_bg.jpg			Joe Colburn <joe@nodomain.com>
diff --git a/bg/scale/Dragon.jpg b/bg/scale/Dragon.jpg
deleted file mode 100644
index 4e3c447..0000000
--- a/bg/scale/Dragon.jpg
+++ /dev/null