Tue Mar 2 10:56:20 2004 Michael Jennings (mej)

New SRPM.


SVN revision: 9193

ChangeLog

@@ -5182,3 +5182,7 @@ Mon Mar  1 16:53:34 2004                        Michael Jennings (mej)
 
 Merging in new backgrounds.
 ----------------------------------------------------------------------
+Tue Mar  2 10:56:20 2004                        Michael Jennings (mej)
+
+New SRPM.
+----------------------------------------------------------------------

Eterm.spec

@@ -1,10 +1,9 @@
 %define bzip     0
-%define strip    0
 
 Summary: Enlightened terminal emulator
 Name: Eterm
-Version: 0.9.2
+Version: 0.9.3
-Release: 5
+Release: 0.1
 Copyright: BSD
 Group: User Interface/X
 Requires: imlib2, imlib2-loader_jpeg, imlib2-loader_png
@@ -38,15 +37,15 @@ export CFLAGS
 # macros I use for compatibility with older versions of the macro
 %configure --bindir=%{_bindir} --libdir=%{_libdir} --mandir=%{_mandir} \
            --datadir=%{_datadir} --sysconfdir=%{_sysconfdir} \
-           --enable-multi-charset --enable-escreen --enable-auto-encoding
+           --enable-multi-charset --enable-escreen --enable-auto-encoding %{?acflags}
-make
+%{__make} %{?mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # If the configure macro is used above (which it is), there
 # is NO reason to use the makeinstall macro here, so don't.
-make DESTDIR=$RPM_BUILD_ROOT install
+%{__make} install DESTDIR=$RPM_BUILD_ROOT %{?mflags_install}
 
 ( cd $RPM_BUILD_ROOT
   mv .%{_bindir}/%{name} .%{_bindir}/%{name}-%{version}
@@ -56,10 +55,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
   chmod +x .%{_libdir}/lib*so* ||:
 )
 
-%if %{strip}
-strip -s $RPM_BUILD_ROOT%{_bindir}/* || :
-%endif
-
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities
 cat > $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/Eterm.desktop <<EOF
 [Desktop Entry]
@@ -87,7 +82,7 @@ test -x /sbin/ldconfig && /sbin/ldconfig
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-, root, root)
 %doc doc/Eterm_reference.html doc/Eterm.1.html doc/Eterm.tcap doc/Eterm.ti doc/README.Escreen
 %doc README ReleaseNotes ReleaseNotes.1 ChangeLog
 %config %{_sysconfdir}/X11/applnk/Utilities/Eterm.desktop

bg/Makefile.am

@@ -3,8 +3,7 @@
 DIRS = tile scale
 UPDATE_SCRIPT = @top_srcdir@/utils/Etbg_update_list
 
-EXTRA_DIST =  tile/circuit.jpg tile/giger1.jpg tile/blackstone.jpg tile/nebula.jpg \
+EXTRA_DIST =  tile/circuit.jpg scale/Neopolis-horizon.jpg README.backgrounds
-              scale/Neopolis-horizon.jpg README.backgrounds
 pixmapdir = $(pkgdatadir)/pix
 themedir = $(pkgdatadir)/themes
 

bg/README.backgrounds

@@ -38,11 +38,10 @@ function.)
 Disclaimer
 ----------
 
-All images distributed with Eterm itself, and all those in the
+Most images distributed with Eterm and its supplementary backgrounds
-supplementary backgrounds collection, were downloaded freely from the
+collection were contributed by their respective authors.  In fact,
-Internet or submitted directly via e-mail by their authors.  None of
+most of these images are original work by me.  Two images have unknown
-these images are original work by me.  Furthermore, I have made every
+copyright but are believed to be in the public domain.
-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
@@ -57,16 +56,63 @@ 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
+these images are included with the supplemental backgrounds
-rather than with the Eterm distribution.
+collection, others with the Eterm distribution.
 
-Neopolis-horizon.jpg		Joe Colburn <joe@nodomain.com>
+All images are copyright their respective authors and are included
-cyber_bg.jpg			Joe Colburn <joe@nodomain.com>
+here by permission.
+
+Neopolis-horizon.jpg            Joe Colburn <joe@nodomain.com>
+acid_chess.png                  Michael Jennings <mej@eterm.org>
+a_distant_star.png              Michael Jennings <mej@eterm.org>
+alpha_centauri.png              Michael Jennings <mej@eterm.org>
+army_brat.png                   Michael Jennings <mej@eterm.org>
 bubbly1.jpg                     Tal Danzig <tal@libranet.com>
 bubbly2.jpg                     Tal Danzig <tal@libranet.com>
 bubbly3.jpg                     Tal Danzig <tal@libranet.com>
 bubbly4.jpg                     Tal Danzig <tal@libranet.com>
+circuit.jpg                     Public Domain
+cold_steel.png                  Michael Jennings <mej@eterm.org>
+conch.png                       Michael Jennings <mej@eterm.org>
 confusion.jpg                   Tal Danzig <tal@libranet.com>
-egg.jpg                         Tal Danzig <tal@libranet.com>
+connect_the_dots.png            Michael Jennings <mej@eterm.org>
-steel1.jpg                      Tal Danzig <tal@libranet.com>
+cyber_bg.jpg                    Joe Colburn <joe@nodomain.com>
-twisted.jpg                     Tal Danzig <tal@libranet.com>
+darkness.png                    Michael Jennings <mej@eterm.org>
+day-night.jpg                   Ted Zlatanov <tzz@lifelogs.com>
+falling.png                     Michael Jennings <mej@eterm.org>
+fascination.png                 Michael Jennings <mej@eterm.org>
+firestorm.png                   Michael Jennings <mej@eterm.org>
+for_a_moment.png                Michael Jennings <mej@eterm.org>
+graffiti.png                    Michael Jennings <mej@eterm.org>
+gray_matter.png                 Michael Jennings <mej@eterm.org>
+lightning_crashes.png           Michael Jennings <mej@eterm.org>
+marbles.png                     Michael Jennings <mej@eterm.org>
+midnight_sky.png                Michael Jennings <mej@eterm.org>
+moody_blues.png                 Michael Jennings <mej@eterm.org>
+murky_depths.png                Michael Jennings <mej@eterm.org>
+oil_on_canvas.png               Michael Jennings <mej@eterm.org>
+pebble_beach.png                Michael Jennings <mej@eterm.org>
+ping-pong.png                   Michael Jennings <mej@eterm.org>
+plasma.png                      Michael Jennings <mej@eterm.org>
+pulse.png                       Michael Jennings <mej@eterm.org>
+rolling_meadows.png             Michael Jennings <mej@eterm.org>
+sailors_delight.png             Michael Jennings <mej@eterm.org>
+shades_of_being.png             Michael Jennings <mej@eterm.org>
+shale.jpg                       Public Domain
+shattered_windows.png           Michael Jennings <mej@eterm.org>
+shock_and_awe.png               Michael Jennings <mej@eterm.org>
+sitting_in_acid.png             Michael Jennings <mej@eterm.org>
+spring_rain.png                 Michael Jennings <mej@eterm.org>
+stained_glass.png               Michael Jennings <mej@eterm.org>
+tales_of_earthsea.png           Michael Jennings <mej@eterm.org>
+tangled_web.png                 Michael Jennings <mej@eterm.org>
+the_wall.png                    Michael Jennings <mej@eterm.org>
+trees_are_leafy.png             Michael Jennings <mej@eterm.org>
+veins_2.png                     Michael Jennings <mej@eterm.org>
+veins.png                       Michael Jennings <mej@eterm.org>
+violetta.png                    Michael Jennings <mej@eterm.org>
+wasteland.jpg                   Brian McFee <keebler@sandwich.net>
+water_into_wine.png             Michael Jennings <mej@eterm.org>
+wintertree.jpg                  Ted Zlatanov <tzz@lifelogs.com>
+wormhole.png                    Michael Jennings <mej@eterm.org>
+woven_memories.png              Michael Jennings <mej@eterm.org>

configure.in

@@ -4,7 +4,7 @@ PATH=$PATH:/usr/bin:/bin:/usr/local/bin:/usr/ccs/bin:/usr/contrib/bin:/usr/ucb/b
 export PATH
 
 AC_INIT(src/feature.h)
-AM_INIT_AUTOMAKE(Eterm, 0.9.2)
+AM_INIT_AUTOMAKE(Eterm, 0.9.3)
 
 dnl# Set some basic variables
 DATE="`date '+%d %B %Y'`"
@@ -656,7 +656,7 @@ AC_ARG_ENABLE(multi-charset,
             else
               MULTI_CHARSET_TYPE="$enableval"
             fi], [
-            if (xlsfonts | grep 10646 >&5 2>&5); then
+            if (xlsfonts 2>/dev/null | grep 10646 >&5 2>&5); then
               MULTI_CHARSET_TYPE="unicode"
             else
               MULTI_CHARSET_TYPE=""
@@ -791,9 +791,9 @@ AC_ARG_ENABLE(xim,
 AC_CHECK_LIB(X11, _Xsetlocale, AC_DEFINE(X_LOCALE), AC_DEFINE(NO_XLOCALE))
 
 # For multibyte selection handling
-if test "$MULTICHAR_ENCODING" != "none"; then
+#if test "$MULTICHAR_ENCODING" != "none"; then
   AC_CHECK_LIB(Xmu, XmuInternAtom)
-fi
+#fi
 
 # check X11R6 for XIM
 if test "$XIM" = "TRUE"; then

doc/menu-master-file.m4

@@ -167,8 +167,6 @@ begin menu
   TILE_IMAGE_ITEM(`A Distant Star', `a_distant_star.png')
   TILE_IMAGE_ITEM(`Alpha Centauri', `alpha_centauri.png')
   TILE_IMAGE_ITEM(`Army Brat', `army_brat.png')
-  TILE_IMAGE_ITEM(`Blackstone', `blackstone.jpg')
-  TILE_IMAGE_ITEM(`Blood Spilt', `blood_spilt.png')
   TILE_IMAGE_ITEM(`Bubbly1', `bubbly1.jpg')
   TILE_IMAGE_ITEM(`Bubbly2', `bubbly2.jpg')
   TILE_IMAGE_ITEM(`Bubbly3', `bubbly3.jpg')
@@ -180,20 +178,16 @@ begin menu
   TILE_IMAGE_ITEM(`Connect The Dots', `connect_the_dots.png')
   TILE_IMAGE_ITEM(`Cyber Bg', `cyber_bg.jpg')
   TILE_IMAGE_ITEM(`Darkness', `darkness.png')
-  TILE_IMAGE_ITEM(`Egg', `egg.jpg')
   TILE_IMAGE_ITEM(`Falling', `falling.png')
   TILE_IMAGE_ITEM(`Fascination', `fascination.png')
   TILE_IMAGE_ITEM(`Firestorm', `firestorm.png')
   TILE_IMAGE_ITEM(`For A Moment', `for_a_moment.png')
-  TILE_IMAGE_ITEM(`Giger1', `giger1.jpg')
-  TILE_IMAGE_ITEM(`Giger2', `giger2.jpg')
   TILE_IMAGE_ITEM(`Graffiti', `graffiti.png')
   TILE_IMAGE_ITEM(`Gray Matter', `gray_matter.png')
   TILE_IMAGE_ITEM(`Lightning Crashes', `lightning_crashes.png')
   TILE_IMAGE_ITEM(`Marbles', `marbles.png')
   TILE_IMAGE_ITEM(`Moody Blues', `moody_blues.png')
   TILE_IMAGE_ITEM(`Murky Depths', `murky_depths.png')
-  TILE_IMAGE_ITEM(`Nebula', `nebula.jpg')
   TILE_IMAGE_ITEM(`Oil On Canvas', `oil_on_canvas.png')
   TILE_IMAGE_ITEM(`Pebble Beach', `pebble_beach.png')
   TILE_IMAGE_ITEM(`Ping Pong', `ping-pong.png')
@@ -205,7 +199,6 @@ begin menu
   TILE_IMAGE_ITEM(`Shattered Windows', `shattered_windows.png')
   TILE_IMAGE_ITEM(`Shock And Awe', `shock_and_awe.png')
   TILE_IMAGE_ITEM(`Sitting In Acid', `sitting_in_acid.png')
-  TILE_IMAGE_ITEM(`Space', `space.png')
   TILE_IMAGE_ITEM(`Spring Rain', `spring_rain.png')
   TILE_IMAGE_ITEM(`Stained Glass', `stained_glass.png')
   TILE_IMAGE_ITEM(`Tales Of Earthsea', `tales_of_earthsea.png')
@@ -222,12 +215,9 @@ end
 begin menu
   title Scaled
   SCALE_IMAGE_ITEM(`Day Night', `day-night.jpg')
-  SCALE_IMAGE_ITEM(`Good Morning', `good-morning.jpg')
   SCALE_IMAGE_ITEM(`Midnight Sky', `midnight_sky.png')
   SCALE_IMAGE_ITEM(`Neopolis Horizon', `Neopolis-horizon.jpg')
-  SCALE_IMAGE_ITEM(`Ripple', `ripple.jpg')
   SCALE_IMAGE_ITEM(`Sailors Delight', `sailors_delight.png')
-  SCALE_IMAGE_ITEM(`Sunset', `sunset.jpg')
   SCALE_IMAGE_ITEM(`Wasteland', `wasteland.jpg')
   SCALE_IMAGE_ITEM(`Wintertree', `wintertree.jpg')
 end

themes/Eterm/menus.cfg

@@ -279,14 +279,6 @@ begin menu
     text "Army Brat"
     action string "\e]20;tile/army_brat.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Blackstone"
-    action string "\e]20;tile/blackstone.jpg;0+0:tile\a"
-  end
-  begin menuitem
-    text "Blood Spilt"
-    action string "\e]20;tile/blood_spilt.png;0+0:tile\a"
-  end
   begin menuitem
     text "Bubbly1"
     action string "\e]20;tile/bubbly1.jpg;0+0:tile\a"
@@ -331,10 +323,6 @@ begin menu
     text "Darkness"
     action string "\e]20;tile/darkness.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Egg"
-    action string "\e]20;tile/egg.jpg;0+0:tile\a"
-  end
   begin menuitem
     text "Falling"
     action string "\e]20;tile/falling.png;0+0:tile\a"
@@ -351,14 +339,6 @@ begin menu
     text "For A Moment"
     action string "\e]20;tile/for_a_moment.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Giger1"
-    action string "\e]20;tile/giger1.jpg;0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger2"
-    action string "\e]20;tile/giger2.jpg;0+0:tile\a"
-  end
   begin menuitem
     text "Graffiti"
     action string "\e]20;tile/graffiti.png;0+0:tile\a"
@@ -383,18 +363,10 @@ begin menu
     text "Murky Depths"
     action string "\e]20;tile/murky_depths.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;tile/nebula.jpg;0+0:tile\a"
-  end
   begin menuitem
     text "Oil On Canvas"
     action string "\e]20;tile/oil_on_canvas.png;0+0:tile\a"
   end
-  begin menuitem
-    text "One If By Land"
-    action string "\e]20;tile/one_if_by_land.png;0+0:tile\a"
-  end
   begin menuitem
     text "Pebble Beach"
     action string "\e]20;tile/pebble_beach.png;0+0:tile\a"
@@ -435,10 +407,6 @@ begin menu
     text "Sitting In Acid"
     action string "\e]20;tile/sitting_in_acid.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Space"
-    action string "\e]20;tile/space.png;0+0:tile\a"
-  end
   begin menuitem
     text "Spring Rain"
     action string "\e]20;tile/spring_rain.png;0+0:tile\a"
@@ -463,10 +431,6 @@ begin menu
     text "Trees Are Leafy"
     action string "\e]20;tile/trees_are_leafy.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Two If By Sea"
-    action string "\e]20;tile/two_if_by_sea.png;0+0:tile\a"
-  end
   begin menuitem
     text "Veins 2"
     action string "\e]20;tile/veins_2.png;0+0:tile\a"
@@ -498,10 +462,6 @@ begin menu
     text "Day Night"
     action string "\e]20;scale/day-night.jpg;100\a"
   end
-  begin menuitem
-    text "Good Morning"
-    action string "\e]20;scale/good-morning.jpg;100\a"
-  end
   begin menuitem
     text "Midnight Sky"
     action string "\e]20;scale/midnight_sky.png;100\a"
@@ -510,18 +470,10 @@ begin menu
     text "Neopolis Horizon"
     action string "\e]20;scale/Neopolis-horizon.jpg;100\a"
   end
-  begin menuitem
-    text "Ripple"
-    action string "\e]20;scale/ripple.jpg;100\a"
-  end
   begin menuitem
     text "Sailors Delight"
     action string "\e]20;scale/sailors_delight.png;100\a"
   end
-  begin menuitem
-    text "Sunset"
-    action string "\e]20;scale/sunset.jpg;100\a"
-  end
   begin menuitem
     text "Wasteland"
     action string "\e]20;scale/wasteland.jpg;100\a"

themes/auto/menus.cfg

@@ -279,14 +279,6 @@ begin menu
     text "Army Brat"
     action string "\e]20;tile/army_brat.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Blackstone"
-    action string "\e]20;tile/blackstone.jpg;0+0:tile\a"
-  end
-  begin menuitem
-    text "Blood Spilt"
-    action string "\e]20;tile/blood_spilt.png;0+0:tile\a"
-  end
   begin menuitem
     text "Bubbly1"
     action string "\e]20;tile/bubbly1.jpg;0+0:tile\a"
@@ -331,10 +323,6 @@ begin menu
     text "Darkness"
     action string "\e]20;tile/darkness.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Egg"
-    action string "\e]20;tile/egg.jpg;0+0:tile\a"
-  end
   begin menuitem
     text "Falling"
     action string "\e]20;tile/falling.png;0+0:tile\a"
@@ -351,14 +339,6 @@ begin menu
     text "For A Moment"
     action string "\e]20;tile/for_a_moment.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Giger1"
-    action string "\e]20;tile/giger1.jpg;0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger2"
-    action string "\e]20;tile/giger2.jpg;0+0:tile\a"
-  end
   begin menuitem
     text "Graffiti"
     action string "\e]20;tile/graffiti.png;0+0:tile\a"
@@ -383,18 +363,10 @@ begin menu
     text "Murky Depths"
     action string "\e]20;tile/murky_depths.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;tile/nebula.jpg;0+0:tile\a"
-  end
   begin menuitem
     text "Oil On Canvas"
     action string "\e]20;tile/oil_on_canvas.png;0+0:tile\a"
   end
-  begin menuitem
-    text "One If By Land"
-    action string "\e]20;tile/one_if_by_land.png;0+0:tile\a"
-  end
   begin menuitem
     text "Pebble Beach"
     action string "\e]20;tile/pebble_beach.png;0+0:tile\a"
@@ -435,10 +407,6 @@ begin menu
     text "Sitting In Acid"
     action string "\e]20;tile/sitting_in_acid.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Space"
-    action string "\e]20;tile/space.png;0+0:tile\a"
-  end
   begin menuitem
     text "Spring Rain"
     action string "\e]20;tile/spring_rain.png;0+0:tile\a"
@@ -463,10 +431,6 @@ begin menu
     text "Trees Are Leafy"
     action string "\e]20;tile/trees_are_leafy.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Two If By Sea"
-    action string "\e]20;tile/two_if_by_sea.png;0+0:tile\a"
-  end
   begin menuitem
     text "Veins 2"
     action string "\e]20;tile/veins_2.png;0+0:tile\a"
@@ -498,10 +462,6 @@ begin menu
     text "Day Night"
     action string "\e]20;scale/day-night.jpg;100\a"
   end
-  begin menuitem
-    text "Good Morning"
-    action string "\e]20;scale/good-morning.jpg;100\a"
-  end
   begin menuitem
     text "Midnight Sky"
     action string "\e]20;scale/midnight_sky.png;100\a"
@@ -510,18 +470,10 @@ begin menu
     text "Neopolis Horizon"
     action string "\e]20;scale/Neopolis-horizon.jpg;100\a"
   end
-  begin menuitem
-    text "Ripple"
-    action string "\e]20;scale/ripple.jpg;100\a"
-  end
   begin menuitem
     text "Sailors Delight"
     action string "\e]20;scale/sailors_delight.png;100\a"
   end
-  begin menuitem
-    text "Sunset"
-    action string "\e]20;scale/sunset.jpg;100\a"
-  end
   begin menuitem
     text "Wasteland"
     action string "\e]20;scale/wasteland.jpg;100\a"

themes/trans/menus.cfg

@@ -279,14 +279,6 @@ begin menu
     text "Army Brat"
     action string "\e]20;tile/army_brat.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Blackstone"
-    action string "\e]20;tile/blackstone.jpg;0+0:tile\a"
-  end
-  begin menuitem
-    text "Blood Spilt"
-    action string "\e]20;tile/blood_spilt.png;0+0:tile\a"
-  end
   begin menuitem
     text "Bubbly1"
     action string "\e]20;tile/bubbly1.jpg;0+0:tile\a"
@@ -331,10 +323,6 @@ begin menu
     text "Darkness"
     action string "\e]20;tile/darkness.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Egg"
-    action string "\e]20;tile/egg.jpg;0+0:tile\a"
-  end
   begin menuitem
     text "Falling"
     action string "\e]20;tile/falling.png;0+0:tile\a"
@@ -351,14 +339,6 @@ begin menu
     text "For A Moment"
     action string "\e]20;tile/for_a_moment.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Giger1"
-    action string "\e]20;tile/giger1.jpg;0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger2"
-    action string "\e]20;tile/giger2.jpg;0+0:tile\a"
-  end
   begin menuitem
     text "Graffiti"
     action string "\e]20;tile/graffiti.png;0+0:tile\a"
@@ -383,18 +363,10 @@ begin menu
     text "Murky Depths"
     action string "\e]20;tile/murky_depths.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;tile/nebula.jpg;0+0:tile\a"
-  end
   begin menuitem
     text "Oil On Canvas"
     action string "\e]20;tile/oil_on_canvas.png;0+0:tile\a"
   end
-  begin menuitem
-    text "One If By Land"
-    action string "\e]20;tile/one_if_by_land.png;0+0:tile\a"
-  end
   begin menuitem
     text "Pebble Beach"
     action string "\e]20;tile/pebble_beach.png;0+0:tile\a"
@@ -435,10 +407,6 @@ begin menu
     text "Sitting In Acid"
     action string "\e]20;tile/sitting_in_acid.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Space"
-    action string "\e]20;tile/space.png;0+0:tile\a"
-  end
   begin menuitem
     text "Spring Rain"
     action string "\e]20;tile/spring_rain.png;0+0:tile\a"
@@ -463,10 +431,6 @@ begin menu
     text "Trees Are Leafy"
     action string "\e]20;tile/trees_are_leafy.png;0+0:tile\a"
   end
-  begin menuitem
-    text "Two If By Sea"
-    action string "\e]20;tile/two_if_by_sea.png;0+0:tile\a"
-  end
   begin menuitem
     text "Veins 2"
     action string "\e]20;tile/veins_2.png;0+0:tile\a"
@@ -498,10 +462,6 @@ begin menu
     text "Day Night"
     action string "\e]20;scale/day-night.jpg;100\a"
   end
-  begin menuitem
-    text "Good Morning"
-    action string "\e]20;scale/good-morning.jpg;100\a"
-  end
   begin menuitem
     text "Midnight Sky"
     action string "\e]20;scale/midnight_sky.png;100\a"
@@ -510,18 +470,10 @@ begin menu
     text "Neopolis Horizon"
     action string "\e]20;scale/Neopolis-horizon.jpg;100\a"
   end
-  begin menuitem
-    text "Ripple"
-    action string "\e]20;scale/ripple.jpg;100\a"
-  end
   begin menuitem
     text "Sailors Delight"
     action string "\e]20;scale/sailors_delight.png;100\a"
   end
-  begin menuitem
-    text "Sunset"
-    action string "\e]20;scale/sunset.jpg;100\a"
-  end
   begin menuitem
     text "Wasteland"
     action string "\e]20;scale/wasteland.jpg;100\a"