Author: Alexander Zangerl <az@debian.org>
Subject: move all bitmaps and images to /usr/share/exmh and /usr/share/exmh/bitmaps. introduce exmh(bitmaps) as location 

diff -urNad exmh-2.7.2/lib/bitmaps/bitmaps.defaults /tmp/dpep.QmONE0/exmh-2.7.2/lib/bitmaps/bitmaps.defaults
--- exmh-2.7.2/lib/bitmaps/bitmaps.defaults	Tue Jan 25 22:38:56 2005
+++ /tmp/dpep.QmONE0/exmh-2.7.2/lib/bitmaps/bitmaps.defaults	Tue Jan 25 22:38:57 2005
@@ -1,5 +1,4 @@
-! All these icons are put in /usr/lib/exmh, which is 
-! a symlink to /usr/lib/exmh-<version>.
+! All these icons are put in /usr/share/exmh/bitmaps/.
 !
 ! This file should be added to the beginning of 
 ! .exmh/exmh-defaults, or (global) app-defaults
@@ -9,29 +8,29 @@
 !
 ! Main view icons:
 !
-*Main.help.bitmap:	@/usr/lib/exmh/help.xbm
-*Main.addr.bitmap:	@/usr/lib/exmh/address.xbm
-*Main.pref.bitmap:	@/usr/lib/exmh/pref.xbm
-*Main.bind.bitmap:	@/usr/lib/exmh/bind.xbm
-*Mops.comp.bitmap:	@/usr/lib/exmh/compose.xbm
-*Mops.forward.bitmap:	@/usr/lib/exmh/forward.xbm
-*Mops.link.bitmap:	@/usr/lib/exmh/link.xbm
-*Mops.move.bitmap:	@/usr/lib/exmh/move.xbm
-*Mops.delete.bitmap:	@/usr/lib/exmh/delete.xbm
-*Mops.unmark.bitmap:	@/usr/lib/exmh/unmark.xbm
-*Fops.inc.bitmap:	@/usr/lib/exmh/getmail.xbm
-*Fops.new.bitmap:	@/usr/lib/exmh/new.xbm
-*Fops.commit.bitmap:	@/usr/lib/exmh/commit.xbm
-*Fops.flist.bitmap:	@/usr/lib/exmh/scan.xbm
-*Fops.search.bitmap:	@/usr/lib/exmh/search.xbm
+*Main.help.bitmap:	@/usr/share/exmh/bitmaps/help.xbm
+*Main.addr.bitmap:	@/usr/share/exmh/bitmaps/address.xbm
+*Main.pref.bitmap:	@/usr/share/exmh/bitmaps/pref.xbm
+*Main.bind.bitmap:	@/usr/share/exmh/bitmaps/bind.xbm
+*Mops.comp.bitmap:	@/usr/share/exmh/bitmaps/compose.xbm
+*Mops.forward.bitmap:	@/usr/share/exmh/bitmaps/forward.xbm
+*Mops.link.bitmap:	@/usr/share/exmh/bitmaps/link.xbm
+*Mops.move.bitmap:	@/usr/share/exmh/bitmaps/move.xbm
+*Mops.delete.bitmap:	@/usr/share/exmh/bitmaps/delete.xbm
+*Mops.unmark.bitmap:	@/usr/share/exmh/bitmaps/unmark.xbm
+*Fops.inc.bitmap:	@/usr/share/exmh/bitmaps/getmail.xbm
+*Fops.new.bitmap:	@/usr/share/exmh/bitmaps/new.xbm
+*Fops.commit.bitmap:	@/usr/share/exmh/bitmaps/commit.xbm
+*Fops.flist.bitmap:	@/usr/share/exmh/bitmaps/scan.xbm
+*Fops.search.bitmap:	@/usr/share/exmh/bitmaps/search.xbm
 !
 ! Message editor icons:
 !
-*Sedit.Menubar.send.bitmap:	@/usr/lib/exmh/send.xbm
-*Sedit.Menubar.abort.bitmap:	@/usr/lib/exmh/abort.xbm
-*Sedit.Menubar.sign.bitmap:	@/usr/lib/exmh/sign.xbm
-*Sedit.Menubar.repl.bitmap:	@/usr/lib/exmh/quote.xbm
-*Sedit.Menubar.help.bitmap:	@/usr/lib/exmh/help.xbm
+*Sedit.Menubar.send.bitmap:	@/usr/share/exmh/bitmaps/send.xbm
+*Sedit.Menubar.abort.bitmap:	@/usr/share/exmh/bitmaps/abort.xbm
+*Sedit.Menubar.sign.bitmap:	@/usr/share/exmh/bitmaps/sign.xbm
+*Sedit.Menubar.repl.bitmap:	@/usr/share/exmh/bitmaps/quote.xbm
+*Sedit.Menubar.help.bitmap:	@/usr/share/exmh/bitmaps/help.xbm
 !
 ! Throw "prev" and "next", as being superfluous
 !
diff -urNad exmh-2.7.2/lib/busy.tcl /tmp/dpep.QmONE0/exmh-2.7.2/lib/busy.tcl
--- exmh-2.7.2/lib/busy.tcl	Tue Jan 25 22:38:56 2005
+++ /tmp/dpep.QmONE0/exmh-2.7.2/lib/busy.tcl	Tue Jan 25 22:38:57 2005
@@ -28,7 +28,7 @@
 with \"@filename\".  You can optionally provide foreground and
 background colors. (See Tk_GetCursor for complete details).
 A final twist is that relative pathnames are munged to be
-absolute pathnames under $exmh(library)
+absolute pathnames under $exmh(bitmaps)
 Examples include:
     watch		- standard watch
     watch blue		- a clear and blue watch
@@ -43,7 +43,7 @@
 "This is a TK specification for a bitmap.  There are only a few
 boring built-in bitmaps, so mostly you specify these with the
 @pathname syntax.  A relative pathname is munged to be an
-absolute pathname under $exmh(library)
+absolute pathname under $exmh(bitmaps)
 Examples include:
     @hourglass1.bitmap		- Standard wish hourglass
     @hourglass1.bitmap blue	- Blue wish hourglass
@@ -62,16 +62,16 @@
     global busy exmh
     # busy(cursor) could be
     # @foo.cursor bar.cursor color color
-    # Here we insert the exmh library
+    # Here we insert the exmh bitmap library
     switch -regexp $busy(cursor) {
 	{^@[^/]} {
-	    regsub @(.*) $busy(cursor) $exmh(library)/\\1 newfile
+	    regsub @(.*) $busy(cursor) $exmh(bitmaps)/\\1 newfile
 	    if ![file exists [lindex $newfile 0]] {
 		Exmh_Status "Invalid file [lindex $newfile 0]"
 		return
 	    }
 	    if {[llength $newfile] > 2} {
-		regsub {([^ ]*) (.*)} $newfile "\\1 $exmh(library)/\\2" newfile
+		regsub {([^ ]*) (.*)} $newfile "\\1 $exmh(bitmaps)/\\2" newfile
 	    }
 	    set busy(Xcursor) @$newfile
 	}
@@ -84,10 +84,10 @@
     global busy exmh
     # busy(bitmap) could be
     # @foo.bitmap bar.bitmap color color
-    # Here we insert the exmh library
+    # Here we insert the exmh bitmap library
     switch -regexp $busy(bitmap) {
 	{^@[^/]} {
-	    regsub @(.*) $busy(bitmap) $exmh(library)/\\1 newfile
+	    regsub @(.*) $busy(bitmap) $exmh(bitmaps)/\\1 newfile
 	    set color [lindex $newfile 1]
 	    set newfile [lindex $newfile 0]
 	    if [file exists $newfile] {
diff -urNad exmh-2.7.2/lib/extrasInit.tcl /tmp/dpep.QmONE0/exmh-2.7.2/lib/extrasInit.tcl
--- exmh-2.7.2/lib/extrasInit.tcl	Tue Jan 25 22:38:56 2005
+++ /tmp/dpep.QmONE0/exmh-2.7.2/lib/extrasInit.tcl	Tue Jan 25 22:38:57 2005
@@ -140,7 +140,7 @@
 
     Preferences_Resource exmh(testglyph) testGlyph flagdown.gif
     if ![string match /* exmh(testglyph)] {
-	set exmh(testglyph) $exmh(library)/$exmh(testglyph)
+	set exmh(testglyph) $exmh(bitmaps)/$exmh(testglyph)
     }
     set time [lindex [time {
 	toplevel .foo
@@ -270,7 +270,7 @@
 
     global exmh
     set faces(default) [Widget_Label $faces(frame) default {left fill} \
-			-bitmap @$exmh(library)/exmh.bitmap]
+			-bitmap @$exmh(bitmaps)/exmh.bitmap]
 
     # kludge to get default background of the labels
     if {$faces(rowEnabled) && $exmh(slowDispShowFaces)} {
diff -urNad exmh-2.7.2/lib/flag.tcl /tmp/dpep.QmONE0/exmh-2.7.2/lib/flag.tcl
--- exmh-2.7.2/lib/flag.tcl	Tue Jan 25 22:38:56 2005
+++ /tmp/dpep.QmONE0/exmh-2.7.2/lib/flag.tcl	Tue Jan 25 22:38:57 2005
@@ -44,7 +44,7 @@
 
     foreach i {iconup icondown iconspool iconupmask icondownmask iconspoolmask iconupglyph icondownglyph iconspoolglyph} {
 	if ![string match /* $flag($i)] {
-	    set flag($i) $exmh(library)/$flag($i)
+	    set flag($i) $exmh(bitmaps)/$flag($i)
 	}
 	if ![file exists $flag($i)] {
 	    set flag($i) 0
diff -urNad exmh-2.7.2/lib/uri.tcl /tmp/dpep.QmONE0/exmh-2.7.2/lib/uri.tcl
--- exmh-2.7.2/lib/uri.tcl	Tue Jan 25 22:38:56 2005
+++ /tmp/dpep.QmONE0/exmh-2.7.2/lib/uri.tcl	Tue Jan 25 22:38:57 2005
@@ -280,7 +280,7 @@
         regsub -all "\[ \t\n\]" $temp_uri {} temp_uri
 	set but [Faces_Button [list URI_StartViewer $temp_uri]]
 	global exmh
-	$but config -bitmap @$exmh(library)/url.bitmap
+	$but config -bitmap @$exmh(bitmaps)/url.bitmap
         if $uri(logOnEnter) {
 	    regsub -all % $temp_uri %% temp_uri
 	    bind $but <Enter> [list Exmh_Status "X-URL:\t$temp_uri"]
