diff -Nru tkgate-1.8.7/config.h tkgate-1.8.7/config.h
--- tkgate-1.8.7/config.h	2012-01-09 11:02:08.000000000 +0000
+++ tkgate-1.8.7/config.h	2007-01-30 03:45:09.000000000 +0000
@@ -52,13 +52,13 @@
   double quotes and should be all one one line.  This list is used to
   find X11, tcl and tk.
 */
-#define TKGATE_INCDIRS		"/usr/include /usr/include/X11"
+#define TKGATE_INCDIRS		"/usr/X11R6/include /usr/X11/include /pkgs/include /usr/local/include /usr/openwin/include /usr/X/include /usr/include /sw/include"
 
 /*
   List of directories to search for tcl library.  The list must be in 
   double quotes and should be all one one line.
 */
-#define TKGATE_LIBDIRS		"/usr/lib /usr/lib/X11 /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`"
+#define TKGATE_LIBDIRS		"/usr/X11R6/lib /usr/X11/lib /pkgs/lib /usr/local/lib /usr/lib /sw/lib"
 
 /*
   Required libraries.  TkGate will not compile unless these libraries are found.
@@ -69,8 +69,8 @@
   Additional libraries we might need in some Unix implementations.  The 'JP'
   variable is for the list for use with old-style 8.0jp Japanese support.
 */
-#define TKGATE_OPTLIBNAMES	"socket m"
-#define TKGATE_JPOPTLIBNAMES	"xpg4 socket m"
+#define TKGATE_OPTLIBNAMES	"dl socket nsl m"
+#define TKGATE_JPOPTLIBNAMES	"xpg4 dl socket nsl m"
 
 
 /*
@@ -79,19 +79,19 @@
   version number to this path.  You can override the default by
   uncommenting the defintion of TKGATE_HOMEDIR below.
  */
-#define TKGATE_HOMEDIRBASE	"/usr/share"
+#define TKGATE_HOMEDIRBASE	"/usr/X11R6/lib"
 
 /*
   The location of the tkgate and gmac executables.  If you change this, you will
   need to run the configure script again.
  */
-#define TKGATE_BINDIR		/usr/bin
+#define TKGATE_BINDIR		/usr/X11R6/bin
 
 /*
   The location of the tkgate and gmac man pages.  If you change this, you will
   need to run the configure script again.
  */
-#define TKGATE_MANDIR		/usr/share/man/man1
+#define TKGATE_MANDIR		/usr/X11R6/man/man1
 
 /*
   Digital circuit editor and simulator.
@@ -101,7 +101,7 @@
 /*
   URL for local documentation
  */
-#define TKGATE_LOCALDOC		"file:/usr/lib/tkgate-" TKGATE_VERSION "/doc/index.html"
+#define TKGATE_LOCALDOC		"file:/usr/X11R6/lib/tkgate-" TKGATE_VERSION "/doc/index.html"
 
 /*
   The TkGate Copyright message.
@@ -316,39 +316,39 @@
 #define TKGATE_CC		gcc
 #endif
 #ifndef OPTRESET
-#define OPTRESET		0
+#define OPTRESET		1
 #endif
 #ifndef USELONGLONG
 #define USELONGLONG		1
 #endif
 
 #ifndef TKGATE_LPATH
-#define TKGATE_LPATH		 -L/usr/lib
+#define TKGATE_LPATH		 -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib
 #endif
 #ifndef TKGATE_IPATH
-#define TKGATE_IPATH		 -I/usr/include/tk8.4 -I/usr/include/tcl8.4
+#define TKGATE_IPATH		 -I/usr/local/include/tk8.4 -I/usr/local/include/tcl8.4 -I/usr/X11R6/include
 #endif
 #ifndef TKGATE_LIBS
-#define TKGATE_LIBS		 -ltk8.4 -ltcl8.4 -lX11 -lm
+#define TKGATE_LIBS		 -ltk84 -ltcl84 -lX11 -lm
 #endif
 
 #ifndef TKGATE_HOMEDIR
-#define TKGATE_HOMEDIR		"/usr/share/tkgate-1.8.7"
+#define TKGATE_HOMEDIR		"/usr/X11R6/lib/tkgate-1.8.7"
 #endif
 
 #ifndef TKGATE_SECONDARYHOME
-#define TKGATE_SECONDARYHOME	"/home/lamby/temp/cdt.T9vchMto/tkgate-1.8.7"
+#define TKGATE_SECONDARYHOME	"/usr/home/hansen/tkgate/tkgate-1.8.7"
 #endif
 
 #ifndef TKGATE_RESIGNAL
-#define TKGATE_RESIGNAL		1
+#define TKGATE_RESIGNAL		0
 #endif
 #ifndef TKGATE_SIGSET
 #define TKGATE_SIGSET		0
 #endif
 
 #ifndef TKGATE_YACC
-#define TKGATE_YACC		bison -y
+#define TKGATE_YACC		yacc
 #endif
 #ifndef TKGATE_LEX
 #define TKGATE_LEX		flex -l
@@ -370,10 +370,10 @@
 #endif
 
 #define TKGATE_GDF		gdf/default.gdf
-#define TKGATE_BITMAPS		bitmaps/add.b bitmaps/anallogo.xbm bitmaps/analyze.gif bitmaps/analyze.xpm bitmaps/and.b bitmaps/arshift.b bitmaps/back.gif bitmaps/back.xpm bitmaps/bat.b bitmaps/bigcurs.b bitmaps/biggatelogo.gif bitmaps/biggatelogo.xbm bitmaps/blk_close.gif bitmaps/blk_close.xpm bitmaps/blk_open.gif bitmaps/blk_open.xpm bitmaps/buf.b bitmaps/bus.b bitmaps/clock.b bitmaps/concat.b bitmaps/cut_curs.b bitmaps/dash.b bitmaps/del_curs.b bitmaps/demuxord1.gif bitmaps/demuxord2.gif bitmaps/demuxsel1.gif bitmaps/demuxsel2.gif bitmaps/dip.b bitmaps/divide.b bitmaps/dot.b bitmaps/edit_brotate.gif bitmaps/edit_brotate.xpm bitmaps/edit_rotate.gif bitmaps/edit_rotate.xpm bitmaps/ff.gif bitmaps/ff.xpm bitmaps/file_new.gif bitmaps/file_new.xpm bitmaps/file_open.gif bitmaps/file_open.xpm bitmaps/file_print.gif bitmaps/file_print.xpm bitmaps/file_save.gif bitmaps/file_save.xpm bitmaps/flipflop.b bitmaps/forward.gif bitmaps/forward.xpm bitmaps/gatelogo.xbm bitmaps/ground.b bitmaps/ichipdir.gif bitmaps/ichip.gif bitmaps/inout.b bitmaps/inv_curs.b bitmaps/iodarrow.b bitmaps/joint.b bitmaps/lab_curs.b bitmaps/large-trek.b bitmaps/led7seg.b bitmaps/led.b bitmaps/led_bar.gif bitmaps/led_bit.gif bitmaps/led_dec.gif bitmaps/led_direct.gif bitmaps/led_hex.gif bitmaps/ledinside.b bitmaps/ledseg1.b bitmaps/ledseg2.b bitmaps/ledseg3.b bitmaps/ledseg4.b bitmaps/ledseg5.b bitmaps/ledseg6.b bitmaps/ledseg7.b bitmaps/lprobe.b bitmaps/Makefile bitmaps/misc.b bitmaps/module.gif bitmaps/mov_curs.b bitmaps/mult.b bitmaps/mux.b bitmaps/muxord1.gif bitmaps/muxord2.gif bitmaps/muxsel1.gif bitmaps/muxsel2.gif bitmaps/nmos.b bitmaps/oldzoom_in.gif bitmaps/or.b bitmaps/plus.b bitmaps/pmos.b bitmaps/probe.b bitmaps/ram.b bitmaps/reg.b bitmaps/regLR.b bitmaps/regTB.b bitmaps/rff.gif bitmaps/rff.xpm bitmaps/rflipflop.b bitmaps/roll.b bitmaps/rom.b bitmaps/rotation0_S.gif bitmaps/rotation0_S.xpm bitmaps/rotation180_S.gif bitmaps/rotation180_S.xpm bitmaps/rotation270_S.gif bitmaps/rotation270_S.xpm bitmaps/rotation90_S.gif bitmaps/rotation90_S.xpm bitmaps/rungate10.xbm bitmaps/rungate11.xbm bitmaps/rungate12.xbm bitmaps/rungate13.xbm bitmaps/rungate14.xbm bitmaps/rungate1.xbm bitmaps/rungate2.xbm bitmaps/rungate3.xbm bitmaps/rungate4.xbm bitmaps/rungate5.xbm bitmaps/rungate6.xbm bitmaps/rungate7.xbm bitmaps/rungate8.xbm bitmaps/rungate9.xbm bitmaps/rungateA.xbm bitmaps/rungateB.xbm bitmaps/rungateC.xbm bitmaps/scroll.b bitmaps/seg7.b bitmaps/shift.b bitmaps/show_xhair.gif bitmaps/show_xhair.xpm bitmaps/sim_break2.b bitmaps/sim_break.gif bitmaps/sim_break.xpm bitmaps/sim_clock.gif bitmaps/sim_clock.xpm bitmaps/sim_dump.gif bitmaps/sim_dump.xpm bitmaps/sim_go.b bitmaps/sim_go.gif bitmaps/sim_load.gif bitmaps/sim_load.xpm bitmaps/sim_pause.b bitmaps/sim_pause.gif bitmaps/sim_script.gif bitmaps/sim_script.xpm bitmaps/simstart.gif bitmaps/simstart.xpm bitmaps/sim_step.b bitmaps/sim_step.gif bitmaps/sim_stop.b bitmaps/sim_stop.gif bitmaps/size_curs.b bitmaps/smallcurs.b bitmaps/smalldot.b bitmaps/smalllogo.xbm bitmaps/strek.b bitmaps/switch.b bitmaps/tap.b bitmaps/trek.b bitmaps/tty.b bitmaps/txtcurs.b bitmaps/Udemuxord1.gif bitmaps/Udemuxord2.gif bitmaps/Udemuxsel1.gif bitmaps/Udemuxsel2.gif bitmaps/Uff.gif bitmaps/Uled_bar.gif bitmaps/Uled_bit.gif bitmaps/Uled_dec.gif bitmaps/Uled_direct.gif bitmaps/Uled_hex.gif bitmaps/Umuxord1.gif bitmaps/Umuxord2.gif bitmaps/Umuxsel1.gif bitmaps/Umuxsel2.gif bitmaps/Urff.gif bitmaps/vdd.b bitmaps/xor.b bitmaps/zoom_in.gif bitmaps/zoom_in.xpm bitmaps/zoom_out.gif bitmaps/zoom_out.xpm
+#define TKGATE_BITMAPS		bitmaps/Makefile bitmaps/Udemuxord1.gif bitmaps/Udemuxord2.gif bitmaps/Udemuxsel1.gif bitmaps/Udemuxsel2.gif bitmaps/Uff.gif bitmaps/Uled_bar.gif bitmaps/Uled_bit.gif bitmaps/Uled_dec.gif bitmaps/Uled_direct.gif bitmaps/Uled_hex.gif bitmaps/Umuxord1.gif bitmaps/Umuxord2.gif bitmaps/Umuxsel1.gif bitmaps/Umuxsel2.gif bitmaps/Urff.gif bitmaps/add.b bitmaps/anallogo.xbm bitmaps/analyze.gif bitmaps/analyze.xpm bitmaps/and.b bitmaps/arshift.b bitmaps/back.gif bitmaps/back.xpm bitmaps/bat.b bitmaps/bigcurs.b bitmaps/biggatelogo.gif bitmaps/biggatelogo.xbm bitmaps/blk_close.gif bitmaps/blk_close.xpm bitmaps/blk_open.gif bitmaps/blk_open.xpm bitmaps/buf.b bitmaps/bus.b bitmaps/clock.b bitmaps/concat.b bitmaps/cut_curs.b bitmaps/dash.b bitmaps/del_curs.b bitmaps/demuxord1.gif bitmaps/demuxord2.gif bitmaps/demuxsel1.gif bitmaps/demuxsel2.gif bitmaps/dip.b bitmaps/divide.b bitmaps/dot.b bitmaps/edit_brotate.gif bitmaps/edit_brotate.xpm bitmaps/edit_rotate.gif bitmaps/edit_rotate.xpm bitmaps/ff.gif bitmaps/ff.xpm bitmaps/file_new.gif bitmaps/file_new.xpm bitmaps/file_open.gif bitmaps/file_open.xpm bitmaps/file_print.gif bitmaps/file_print.xpm bitmaps/file_save.gif bitmaps/file_save.xpm bitmaps/flipflop.b bitmaps/forward.gif bitmaps/forward.xpm bitmaps/gatelogo.xbm bitmaps/ground.b bitmaps/ichip.gif bitmaps/ichipdir.gif bitmaps/inout.b bitmaps/inv_curs.b bitmaps/iodarrow.b bitmaps/joint.b bitmaps/lab_curs.b bitmaps/large-trek.b bitmaps/led.b bitmaps/led7seg.b bitmaps/led_bar.gif bitmaps/led_bit.gif bitmaps/led_dec.gif bitmaps/led_direct.gif bitmaps/led_hex.gif bitmaps/ledinside.b bitmaps/ledseg1.b bitmaps/ledseg2.b bitmaps/ledseg3.b bitmaps/ledseg4.b bitmaps/ledseg5.b bitmaps/ledseg6.b bitmaps/ledseg7.b bitmaps/lprobe.b bitmaps/misc.b bitmaps/module.gif bitmaps/mov_curs.b bitmaps/mult.b bitmaps/mux.b bitmaps/muxord1.gif bitmaps/muxord2.gif bitmaps/muxsel1.gif bitmaps/muxsel2.gif bitmaps/nmos.b bitmaps/oldzoom_in.gif bitmaps/or.b bitmaps/plus.b bitmaps/pmos.b bitmaps/probe.b bitmaps/ram.b bitmaps/reg.b bitmaps/regLR.b bitmaps/regTB.b bitmaps/rff.gif bitmaps/rff.xpm bitmaps/rflipflop.b bitmaps/roll.b bitmaps/rom.b bitmaps/rotation0_S.gif bitmaps/rotation0_S.xpm bitmaps/rotation180_S.gif bitmaps/rotation180_S.xpm bitmaps/rotation270_S.gif bitmaps/rotation270_S.xpm bitmaps/rotation90_S.gif bitmaps/rotation90_S.xpm bitmaps/rungate1.xbm bitmaps/rungate10.xbm bitmaps/rungate11.xbm bitmaps/rungate12.xbm bitmaps/rungate13.xbm bitmaps/rungate14.xbm bitmaps/rungate2.xbm bitmaps/rungate3.xbm bitmaps/rungate4.xbm bitmaps/rungate5.xbm bitmaps/rungate6.xbm bitmaps/rungate7.xbm bitmaps/rungate8.xbm bitmaps/rungate9.xbm bitmaps/rungateA.xbm bitmaps/rungateB.xbm bitmaps/rungateC.xbm bitmaps/scroll.b bitmaps/seg7.b bitmaps/shift.b bitmaps/show_xhair.gif bitmaps/show_xhair.xpm bitmaps/sim_break.gif bitmaps/sim_break.xpm bitmaps/sim_break2.b bitmaps/sim_clock.gif bitmaps/sim_clock.xpm bitmaps/sim_dump.gif bitmaps/sim_dump.xpm bitmaps/sim_go.b bitmaps/sim_go.gif bitmaps/sim_load.gif bitmaps/sim_load.xpm bitmaps/sim_pause.b bitmaps/sim_pause.gif bitmaps/sim_script.gif bitmaps/sim_script.xpm bitmaps/sim_step.b bitmaps/sim_step.gif bitmaps/sim_stop.b bitmaps/sim_stop.gif bitmaps/simstart.gif bitmaps/simstart.xpm bitmaps/size_curs.b bitmaps/smallcurs.b bitmaps/smalldot.b bitmaps/smalllogo.xbm bitmaps/strek.b bitmaps/switch.b bitmaps/tap.b bitmaps/trek.b bitmaps/tty.b bitmaps/txtcurs.b bitmaps/vdd.b bitmaps/xor.b bitmaps/zoom_in.gif bitmaps/zoom_in.xpm bitmaps/zoom_out.gif bitmaps/zoom_out.xpm
 #define TKGATE_SCRIPTS		scripts/action.tcl scripts/bitedit.tcl scripts/blocklist.tcl scripts/circuit.tcl scripts/commands.tcl scripts/cpath.tcl scripts/dip.tcl scripts/dragger.tcl scripts/dropbox.tcl scripts/editgate.tcl scripts/editnets.tcl scripts/elistbox.tcl scripts/errbox.tcl scripts/frame.tcl scripts/gcanvas.tcl scripts/helpon.tcl scripts/license.tcl scripts/menu.tcl scripts/message.tcl scripts/misc.tcl scripts/nameframe.tcl scripts/options.tcl scripts/parms.tcl scripts/portlist.tcl scripts/print.tcl scripts/scope.tcl scripts/shortcuts.tcl scripts/simtty.tcl scripts/simulator.tcl scripts/status.tcl scripts/tkgate.tcl scripts/toolbar.tcl scripts/tree.tcl
 #define TKGATE_DOCS		doc/gateEdit.html doc/gateGmac.html doc/gateIntro.html doc/gateSim.html doc/index.html doc/adding_gate_types.txt doc/license.txt doc/symbols.txt doc/menagerie.gm
-#define TKGATE_DOCFIGS		doc/fig/anallogo.gif doc/fig/analopts.gif doc/fig/analyze.gif doc/fig/arrow4.gif doc/fig/arrow.gif doc/fig/back.gif doc/fig/balloon.gif doc/fig/biggatelogo.gif doc/fig/blk_close.gif doc/fig/blk_open.gif doc/fig/break.gif doc/fig/chdir.gif doc/fig/circprop.gif doc/fig/coloropts.gif doc/fig/connect1a.gif doc/fig/connect1b.gif doc/fig/connect1c.gif doc/fig/connect1d.gif doc/fig/connect2a.gif doc/fig/connect2b.gif doc/fig/connect2c.gif doc/fig/connect2d.gif doc/fig/cpathcirc.gif doc/fig/cpathdlg.gif doc/fig/create1.gif doc/fig/create2.gif doc/fig/create3.gif doc/fig/create4.gif doc/fig/cretin.gif doc/fig/cretinout.gif doc/fig/cretout.gif doc/fig/cut_curs.gif doc/fig/cutters.gif doc/fig/del_curs.gif doc/fig/dipval.gif doc/fig/edbreak.gif doc/fig/edclock.gif doc/fig/edcomment.gif doc/fig/eddelay.gif doc/fig/edgat.gif doc/fig/ednet.gif doc/fig/edpnet.gif doc/fig/edport.gif doc/fig/filemenu.gif doc/fig/file_new.gif doc/fig/file_open.gif doc/fig/fileopen.gif doc/fig/file_print.gif doc/fig/file_save.gif doc/fig/forward.gif doc/fig/g_add.gif doc/fig/g_and.gif doc/fig/g_arshift.gif doc/fig/gatelogo.gif doc/fig/gateport.gif doc/fig/gatewin_11.gif doc/fig/gatewin.gif doc/fig/gatwin.gif doc/fig/g_block.gif doc/fig/g_buf.gif doc/fig/g_bufif.gif doc/fig/g_clock.gif doc/fig/g_comment.gif doc/fig/g_demux.gif doc/fig/g_dip.gif doc/fig/g_div.gif doc/fig/genopts.gif doc/fig/g_ff.gif doc/fig/g_frame.gif doc/fig/g_ground.gif doc/fig/g_led.gif doc/fig/g_lshift.gif doc/fig/g_merge.gif doc/fig/g_mul.gif doc/fig/g_mux.gif doc/fig/g_nmos.gif doc/fig/g_or.gif doc/fig/g_pmos.gif doc/fig/g_ram.gif doc/fig/g_red.gif doc/fig/g_reg.gif doc/fig/g_roll.gif doc/fig/g_rom.gif doc/fig/g_rshift.gif doc/fig/g_supply.gif doc/fig/g_switch.gif doc/fig/g_tap.gif doc/fig/g_tty.gif doc/fig/g_xor.gif doc/fig/icextract.gif doc/fig/inout.gif doc/fig/invaddel.gif doc/fig/inv_curs.gif doc/fig/label.gif doc/fig/logic0.gif doc/fig/logic1.gif doc/fig/logic.gif doc/fig/logicH.gif doc/fig/logicL.gif doc/fig/logicx.gif doc/fig/logicz.gif doc/fig/makeand.gif doc/fig/manual.gif doc/fig/modcreate.gif doc/fig/mov_curs.gif doc/fig/movgat1.gif doc/fig/movgat2.gif doc/fig/movgrp1.gif doc/fig/movgrp2.gif doc/fig/movgrp3.gif doc/fig/movgrp4.gif doc/fig/nihongo.gif doc/fig/options.gif doc/fig/popcreate.gif doc/fig/powerbsd.gif doc/fig/printdlg.gif doc/fig/printopts.gif doc/fig/ptr.gif doc/fig/rungate1.gif doc/fig/rungate2.gif doc/fig/scope.gif doc/fig/search.gif doc/fig/showval.gif doc/fig/sim_break.gif doc/fig/sim_clock.gif doc/fig/sim_dump.gif doc/fig/simerr.gif doc/fig/sim_go.gif doc/fig/sim_load.gif doc/fig/simopts.gif doc/fig/sim_pause.gif doc/fig/simprint.gif doc/fig/sim_script.gif doc/fig/simstart.gif doc/fig/sim_step.gif doc/fig/sim_stop.gif doc/fig/size_curs.gif doc/fig/smallgatwin.gif doc/fig/smallgenopts.gif doc/fig/small_tkgate.gif doc/fig/solder.gif doc/fig/text.gif doc/fig/tkgate.gif doc/fig/wsize.gif doc/fig/xmark.gif doc/fig/zoom_in.gif doc/fig/zoom_out.gif
+#define TKGATE_DOCFIGS		doc/fig/anallogo.gif doc/fig/analopts.gif doc/fig/analyze.gif doc/fig/arrow.gif doc/fig/arrow4.gif doc/fig/back.gif doc/fig/balloon.gif doc/fig/biggatelogo.gif doc/fig/blk_close.gif doc/fig/blk_open.gif doc/fig/break.gif doc/fig/chdir.gif doc/fig/circprop.gif doc/fig/coloropts.gif doc/fig/connect1a.gif doc/fig/connect1b.gif doc/fig/connect1c.gif doc/fig/connect1d.gif doc/fig/connect2a.gif doc/fig/connect2b.gif doc/fig/connect2c.gif doc/fig/connect2d.gif doc/fig/cpathcirc.gif doc/fig/cpathdlg.gif doc/fig/create1.gif doc/fig/create2.gif doc/fig/create3.gif doc/fig/create4.gif doc/fig/cretin.gif doc/fig/cretinout.gif doc/fig/cretout.gif doc/fig/cut_curs.gif doc/fig/cutters.gif doc/fig/del_curs.gif doc/fig/dipval.gif doc/fig/edbreak.gif doc/fig/edclock.gif doc/fig/edcomment.gif doc/fig/eddelay.gif doc/fig/edgat.gif doc/fig/ednet.gif doc/fig/edpnet.gif doc/fig/edport.gif doc/fig/file_new.gif doc/fig/file_open.gif doc/fig/file_print.gif doc/fig/file_save.gif doc/fig/filemenu.gif doc/fig/fileopen.gif doc/fig/forward.gif doc/fig/g_add.gif doc/fig/g_and.gif doc/fig/g_arshift.gif doc/fig/g_block.gif doc/fig/g_buf.gif doc/fig/g_bufif.gif doc/fig/g_clock.gif doc/fig/g_comment.gif doc/fig/g_demux.gif doc/fig/g_dip.gif doc/fig/g_div.gif doc/fig/g_ff.gif doc/fig/g_frame.gif doc/fig/g_ground.gif doc/fig/g_led.gif doc/fig/g_lshift.gif doc/fig/g_merge.gif doc/fig/g_mul.gif doc/fig/g_mux.gif doc/fig/g_nmos.gif doc/fig/g_or.gif doc/fig/g_pmos.gif doc/fig/g_ram.gif doc/fig/g_red.gif doc/fig/g_reg.gif doc/fig/g_roll.gif doc/fig/g_rom.gif doc/fig/g_rshift.gif doc/fig/g_supply.gif doc/fig/g_switch.gif doc/fig/g_tap.gif doc/fig/g_tty.gif doc/fig/g_xor.gif doc/fig/gatelogo.gif doc/fig/gateport.gif doc/fig/gatewin.gif doc/fig/gatewin_11.gif doc/fig/gatwin.gif doc/fig/genopts.gif doc/fig/icextract.gif doc/fig/inout.gif doc/fig/inv_curs.gif doc/fig/invaddel.gif doc/fig/label.gif doc/fig/logic.gif doc/fig/logic0.gif doc/fig/logic1.gif doc/fig/logicH.gif doc/fig/logicL.gif doc/fig/logicx.gif doc/fig/logicz.gif doc/fig/makeand.gif doc/fig/manual.gif doc/fig/modcreate.gif doc/fig/mov_curs.gif doc/fig/movgat1.gif doc/fig/movgat2.gif doc/fig/movgrp1.gif doc/fig/movgrp2.gif doc/fig/movgrp3.gif doc/fig/movgrp4.gif doc/fig/nihongo.gif doc/fig/options.gif doc/fig/popcreate.gif doc/fig/powerbsd.gif doc/fig/printdlg.gif doc/fig/printopts.gif doc/fig/ptr.gif doc/fig/rungate1.gif doc/fig/rungate2.gif doc/fig/scope.gif doc/fig/search.gif doc/fig/showval.gif doc/fig/sim_break.gif doc/fig/sim_clock.gif doc/fig/sim_dump.gif doc/fig/sim_go.gif doc/fig/sim_load.gif doc/fig/sim_pause.gif doc/fig/sim_script.gif doc/fig/sim_step.gif doc/fig/sim_stop.gif doc/fig/simerr.gif doc/fig/simopts.gif doc/fig/simprint.gif doc/fig/simstart.gif doc/fig/size_curs.gif doc/fig/small_tkgate.gif doc/fig/smallgatwin.gif doc/fig/smallgenopts.gif doc/fig/solder.gif doc/fig/text.gif doc/fig/tkgate.gif doc/fig/wsize.gif doc/fig/xmark.gif doc/fig/zoom_in.gif doc/fig/zoom_out.gif
 /*** END-AUTO - end of automatically generated section ***/
 
 #define PassCDebugFlags
diff -Nru tkgate-1.8.7/debian/changelog tkgate-1.8.7/debian/changelog
--- tkgate-1.8.7/debian/changelog	2012-01-09 11:02:08.000000000 +0000
+++ tkgate-1.8.7/debian/changelog	2011-12-29 10:34:47.000000000 +0000
@@ -1,3 +1,13 @@
+tkgate (1.8.7-4) unstable; urgency=low
+
+  * QA upload.
+  * Switch to DebSrc3.0 (quilt) format for patch handling.
+  * Fix the path to gsim (Closes: #490945).
+  * Specify stricter dependency on data package.
+  * Upgrade to Tcl/Tk 8.5.
+
+ -- Andrew O. Shadura <bugzilla@tut.by>  Thu, 29 Dec 2011 13:09:40 +0300
+
 tkgate (1.8.7-3) unstable; urgency=low
 
   * QA upload.
diff -Nru tkgate-1.8.7/debian/control tkgate-1.8.7/debian/control
--- tkgate-1.8.7/debian/control	2012-01-09 11:02:08.000000000 +0000
+++ tkgate-1.8.7/debian/control	2011-12-29 10:39:05.000000000 +0000
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.org>
 Standards-Version: 3.8.2
-Build-Depends: debhelper (>=5), tcl8.4-dev, tk8.4-dev, bison|byacc, flex, libx11-dev, dhelp, xutils-dev, dpkg-dev (>= 1.16.0)
+Build-Depends: debhelper (>=5), tcl8.5-dev, tk8.5-dev, bison|byacc, flex, libx11-dev, dhelp, xutils-dev, dpkg-dev (>= 1.16.0)
 Homepage: http://www.tkgate.org/
 
 Package: tkgate
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tkgate-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, tkgate-data (= ${source:Version})
 Recommends: tkgate-doc
 Description: Event driven digital circuit simulator with Tcl/Tk
  TkGate is a event driven digital circuit simulator with a Tcl/Tk-based
@@ -22,7 +22,7 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: tkgate, tkgate-doc
-Suggests:  tcl8.4, tk8.4
+Suggests:  tcl8.5, tk8.5
 Description: Event driven digital circuit simulator with Tcl/Tk
  TkGate is a event driven digital circuit simulator with a Tcl/Tk-based
  graphical editor.
diff -Nru tkgate-1.8.7/debian/patches/01-path-to-wish.diff tkgate-1.8.7/debian/patches/01-path-to-wish.diff
--- tkgate-1.8.7/debian/patches/01-path-to-wish.diff	1970-01-01 00:00:00.000000000 +0000
+++ tkgate-1.8.7/debian/patches/01-path-to-wish.diff	2011-12-29 10:05:43.000000000 +0000
@@ -0,0 +1,10 @@
+Description: Fix the path to wish interpreter.
+
+--- tkgate-1.8.7.orig/scripts/elistbox.tcl
++++ tkgate-1.8.7/scripts/elistbox.tcl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/wish8.3
++#!/usr/bin/wish
+ 
+ set elistbox_debug 0
+ 
diff -Nru tkgate-1.8.7/debian/patches/02-honour-destdir.diff tkgate-1.8.7/debian/patches/02-honour-destdir.diff
--- tkgate-1.8.7/debian/patches/02-honour-destdir.diff	1970-01-01 00:00:00.000000000 +0000
+++ tkgate-1.8.7/debian/patches/02-honour-destdir.diff	2011-12-29 10:05:58.000000000 +0000
@@ -0,0 +1,10 @@
+Description: Honour DESTDIR
+
+--- tkgate-1.8.7.orig/Imakefile
++++ tkgate-1.8.7/Imakefile
+@@ -99,4 +99,4 @@ uninstall::
+ 	@echo "All files from ${HOMEDIR}"
+ 
+ install::
+-	cp -r locale ${HOMEDIR}
++	cp -r locale ${DESTDIR}${HOMEDIR}
diff -Nru tkgate-1.8.7/debian/patches/03-fix-config.h.diff tkgate-1.8.7/debian/patches/03-fix-config.h.diff
--- tkgate-1.8.7/debian/patches/03-fix-config.h.diff	1970-01-01 00:00:00.000000000 +0000
+++ tkgate-1.8.7/debian/patches/03-fix-config.h.diff	2011-12-29 10:06:20.000000000 +0000
@@ -0,0 +1,124 @@
+Description: Use correct paths in config.h
+
+--- tkgate-1.8.7.orig/config.h
++++ tkgate-1.8.7/config.h
+@@ -52,13 +52,13 @@
+   double quotes and should be all one one line.  This list is used to
+   find X11, tcl and tk.
+ */
+-#define TKGATE_INCDIRS		"/usr/X11R6/include /usr/X11/include /pkgs/include /usr/local/include /usr/openwin/include /usr/X/include /usr/include /sw/include"
++#define TKGATE_INCDIRS		"/usr/include /usr/include/X11"
+ 
+ /*
+   List of directories to search for tcl library.  The list must be in 
+   double quotes and should be all one one line.
+ */
+-#define TKGATE_LIBDIRS		"/usr/X11R6/lib /usr/X11/lib /pkgs/lib /usr/local/lib /usr/lib /sw/lib"
++#define TKGATE_LIBDIRS		"/usr/lib /usr/lib/X11 /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`"
+ 
+ /*
+   Required libraries.  TkGate will not compile unless these libraries are found.
+@@ -69,8 +69,8 @@
+   Additional libraries we might need in some Unix implementations.  The 'JP'
+   variable is for the list for use with old-style 8.0jp Japanese support.
+ */
+-#define TKGATE_OPTLIBNAMES	"dl socket nsl m"
+-#define TKGATE_JPOPTLIBNAMES	"xpg4 dl socket nsl m"
++#define TKGATE_OPTLIBNAMES	"socket m"
++#define TKGATE_JPOPTLIBNAMES	"xpg4 socket m"
+ 
+ 
+ /*
+@@ -79,19 +79,19 @@
+   version number to this path.  You can override the default by
+   uncommenting the defintion of TKGATE_HOMEDIR below.
+  */
+-#define TKGATE_HOMEDIRBASE	"/usr/X11R6/lib"
++#define TKGATE_HOMEDIRBASE	"/usr/share"
+ 
+ /*
+   The location of the tkgate and gmac executables.  If you change this, you will
+   need to run the configure script again.
+  */
+-#define TKGATE_BINDIR		/usr/X11R6/bin
++#define TKGATE_BINDIR		/usr/bin
+ 
+ /*
+   The location of the tkgate and gmac man pages.  If you change this, you will
+   need to run the configure script again.
+  */
+-#define TKGATE_MANDIR		/usr/X11R6/man/man1
++#define TKGATE_MANDIR		/usr/share/man/man1
+ 
+ /*
+   Digital circuit editor and simulator.
+@@ -101,7 +101,7 @@
+ /*
+   URL for local documentation
+  */
+-#define TKGATE_LOCALDOC		"file:/usr/X11R6/lib/tkgate-" TKGATE_VERSION "/doc/index.html"
++#define TKGATE_LOCALDOC		"file:/usr/lib/tkgate-" TKGATE_VERSION "/doc/index.html"
+ 
+ /*
+   The TkGate Copyright message.
+@@ -316,39 +316,39 @@
+ #define TKGATE_CC		gcc
+ #endif
+ #ifndef OPTRESET
+-#define OPTRESET		1
++#define OPTRESET		0
+ #endif
+ #ifndef USELONGLONG
+ #define USELONGLONG		1
+ #endif
+ 
+ #ifndef TKGATE_LPATH
+-#define TKGATE_LPATH		 -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib
++#define TKGATE_LPATH		 -L/usr/lib
+ #endif
+ #ifndef TKGATE_IPATH
+-#define TKGATE_IPATH		 -I/usr/local/include/tk8.4 -I/usr/local/include/tcl8.4 -I/usr/X11R6/include
++#define TKGATE_IPATH		 -I/usr/include/tk8.4 -I/usr/include/tcl8.4
+ #endif
+ #ifndef TKGATE_LIBS
+-#define TKGATE_LIBS		 -ltk84 -ltcl84 -lX11 -lm
++#define TKGATE_LIBS		 -ltk8.4 -ltcl8.4 -lX11 -lm
+ #endif
+ 
+ #ifndef TKGATE_HOMEDIR
+-#define TKGATE_HOMEDIR		"/usr/X11R6/lib/tkgate-1.8.7"
++#define TKGATE_HOMEDIR		"/usr/share/tkgate-1.8.7"
+ #endif
+ 
+ #ifndef TKGATE_SECONDARYHOME
+-#define TKGATE_SECONDARYHOME	"/usr/home/hansen/tkgate/tkgate-1.8.7"
++#define TKGATE_SECONDARYHOME	"/home/lamby/temp/cdt.T9vchMto/tkgate-1.8.7"
+ #endif
+ 
+ #ifndef TKGATE_RESIGNAL
+-#define TKGATE_RESIGNAL		0
++#define TKGATE_RESIGNAL		1
+ #endif
+ #ifndef TKGATE_SIGSET
+ #define TKGATE_SIGSET		0
+ #endif
+ 
+ #ifndef TKGATE_YACC
+-#define TKGATE_YACC		yacc
++#define TKGATE_YACC		bison -y
+ #endif
+ #ifndef TKGATE_LEX
+ #define TKGATE_LEX		flex -l
+@@ -370,10 +370,10 @@
+ #endif
+ 
+ #define TKGATE_GDF		gdf/default.gdf
+-#define TKGATE_BITMAPS		bitmaps/Makefile bitmaps/Udemuxord1.gif bitmaps/Udemuxord2.gif bitmaps/Udemuxsel1.gif bitmaps/Udemuxsel2.gif bitmaps/Uff.gif bitmaps/Uled_bar.gif bitmaps/Uled_bit.gif bitmaps/Uled_dec.gif bitmaps/Uled_direct.gif bitmaps/Uled_hex.gif bitmaps/Umuxord1.gif bitmaps/Umuxord2.gif bitmaps/Umuxsel1.gif bitmaps/Umuxsel2.gif bitmaps/Urff.gif bitmaps/add.b bitmaps/anallogo.xbm bitmaps/analyze.gif bitmaps/analyze.xpm bitmaps/and.b bitmaps/arshift.b bitmaps/back.gif bitmaps/back.xpm bitmaps/bat.b bitmaps/bigcurs.b bitmaps/biggatelogo.gif bitmaps/biggatelogo.xbm bitmaps/blk_close.gif bitmaps/blk_close.xpm bitmaps/blk_open.gif bitmaps/blk_open.xpm bitmaps/buf.b bitmaps/bus.b bitmaps/clock.b bitmaps/concat.b bitmaps/cut_curs.b bitmaps/dash.b bitmaps/del_curs.b bitmaps/demuxord1.gif bitmaps/demuxord2.gif bitmaps/demuxsel1.gif bitmaps/demuxsel2.gif bitmaps/dip.b bitmaps/divide.b bitmaps/dot.b bitmaps/edit_brotate.gif bitmaps/edit_brotate.xpm bitmaps/edit_rotate.gif bitmaps/edit_rotate.xpm bitmaps/ff.gif bitmaps/ff.xpm bitmaps/file_new.gif bitmaps/file_new.xpm bitmaps/file_open.gif bitmaps/file_open.xpm bitmaps/file_print.gif bitmaps/file_print.xpm bitmaps/file_save.gif bitmaps/file_save.xpm bitmaps/flipflop.b bitmaps/forward.gif bitmaps/forward.xpm bitmaps/gatelogo.xbm bitmaps/ground.b bitmaps/ichip.gif bitmaps/ichipdir.gif bitmaps/inout.b bitmaps/inv_curs.b bitmaps/iodarrow.b bitmaps/joint.b bitmaps/lab_curs.b bitmaps/large-trek.b bitmaps/led.b bitmaps/led7seg.b bitmaps/led_bar.gif bitmaps/led_bit.gif bitmaps/led_dec.gif bitmaps/led_direct.gif bitmaps/led_hex.gif bitmaps/ledinside.b bitmaps/ledseg1.b bitmaps/ledseg2.b bitmaps/ledseg3.b bitmaps/ledseg4.b bitmaps/ledseg5.b bitmaps/ledseg6.b bitmaps/ledseg7.b bitmaps/lprobe.b bitmaps/misc.b bitmaps/module.gif bitmaps/mov_curs.b bitmaps/mult.b bitmaps/mux.b bitmaps/muxord1.gif bitmaps/muxord2.gif bitmaps/muxsel1.gif bitmaps/muxsel2.gif bitmaps/nmos.b bitmaps/oldzoom_in.gif bitmaps/or.b bitmaps/plus.b bitmaps/pmos.b bitmaps/probe.b bitmaps/ram.b bitmaps/reg.b bitmaps/regLR.b bitmaps/regTB.b bitmaps/rff.gif bitmaps/rff.xpm bitmaps/rflipflop.b bitmaps/roll.b bitmaps/rom.b bitmaps/rotation0_S.gif bitmaps/rotation0_S.xpm bitmaps/rotation180_S.gif bitmaps/rotation180_S.xpm bitmaps/rotation270_S.gif bitmaps/rotation270_S.xpm bitmaps/rotation90_S.gif bitmaps/rotation90_S.xpm bitmaps/rungate1.xbm bitmaps/rungate10.xbm bitmaps/rungate11.xbm bitmaps/rungate12.xbm bitmaps/rungate13.xbm bitmaps/rungate14.xbm bitmaps/rungate2.xbm bitmaps/rungate3.xbm bitmaps/rungate4.xbm bitmaps/rungate5.xbm bitmaps/rungate6.xbm bitmaps/rungate7.xbm bitmaps/rungate8.xbm bitmaps/rungate9.xbm bitmaps/rungateA.xbm bitmaps/rungateB.xbm bitmaps/rungateC.xbm bitmaps/scroll.b bitmaps/seg7.b bitmaps/shift.b bitmaps/show_xhair.gif bitmaps/show_xhair.xpm bitmaps/sim_break.gif bitmaps/sim_break.xpm bitmaps/sim_break2.b bitmaps/sim_clock.gif bitmaps/sim_clock.xpm bitmaps/sim_dump.gif bitmaps/sim_dump.xpm bitmaps/sim_go.b bitmaps/sim_go.gif bitmaps/sim_load.gif bitmaps/sim_load.xpm bitmaps/sim_pause.b bitmaps/sim_pause.gif bitmaps/sim_script.gif bitmaps/sim_script.xpm bitmaps/sim_step.b bitmaps/sim_step.gif bitmaps/sim_stop.b bitmaps/sim_stop.gif bitmaps/simstart.gif bitmaps/simstart.xpm bitmaps/size_curs.b bitmaps/smallcurs.b bitmaps/smalldot.b bitmaps/smalllogo.xbm bitmaps/strek.b bitmaps/switch.b bitmaps/tap.b bitmaps/trek.b bitmaps/tty.b bitmaps/txtcurs.b bitmaps/vdd.b bitmaps/xor.b bitmaps/zoom_in.gif bitmaps/zoom_in.xpm bitmaps/zoom_out.gif bitmaps/zoom_out.xpm
++#define TKGATE_BITMAPS		bitmaps/add.b bitmaps/anallogo.xbm bitmaps/analyze.gif bitmaps/analyze.xpm bitmaps/and.b bitmaps/arshift.b bitmaps/back.gif bitmaps/back.xpm bitmaps/bat.b bitmaps/bigcurs.b bitmaps/biggatelogo.gif bitmaps/biggatelogo.xbm bitmaps/blk_close.gif bitmaps/blk_close.xpm bitmaps/blk_open.gif bitmaps/blk_open.xpm bitmaps/buf.b bitmaps/bus.b bitmaps/clock.b bitmaps/concat.b bitmaps/cut_curs.b bitmaps/dash.b bitmaps/del_curs.b bitmaps/demuxord1.gif bitmaps/demuxord2.gif bitmaps/demuxsel1.gif bitmaps/demuxsel2.gif bitmaps/dip.b bitmaps/divide.b bitmaps/dot.b bitmaps/edit_brotate.gif bitmaps/edit_brotate.xpm bitmaps/edit_rotate.gif bitmaps/edit_rotate.xpm bitmaps/ff.gif bitmaps/ff.xpm bitmaps/file_new.gif bitmaps/file_new.xpm bitmaps/file_open.gif bitmaps/file_open.xpm bitmaps/file_print.gif bitmaps/file_print.xpm bitmaps/file_save.gif bitmaps/file_save.xpm bitmaps/flipflop.b bitmaps/forward.gif bitmaps/forward.xpm bitmaps/gatelogo.xbm bitmaps/ground.b bitmaps/ichipdir.gif bitmaps/ichip.gif bitmaps/inout.b bitmaps/inv_curs.b bitmaps/iodarrow.b bitmaps/joint.b bitmaps/lab_curs.b bitmaps/large-trek.b bitmaps/led7seg.b bitmaps/led.b bitmaps/led_bar.gif bitmaps/led_bit.gif bitmaps/led_dec.gif bitmaps/led_direct.gif bitmaps/led_hex.gif bitmaps/ledinside.b bitmaps/ledseg1.b bitmaps/ledseg2.b bitmaps/ledseg3.b bitmaps/ledseg4.b bitmaps/ledseg5.b bitmaps/ledseg6.b bitmaps/ledseg7.b bitmaps/lprobe.b bitmaps/Makefile bitmaps/misc.b bitmaps/module.gif bitmaps/mov_curs.b bitmaps/mult.b bitmaps/mux.b bitmaps/muxord1.gif bitmaps/muxord2.gif bitmaps/muxsel1.gif bitmaps/muxsel2.gif bitmaps/nmos.b bitmaps/oldzoom_in.gif bitmaps/or.b bitmaps/plus.b bitmaps/pmos.b bitmaps/probe.b bitmaps/ram.b bitmaps/reg.b bitmaps/regLR.b bitmaps/regTB.b bitmaps/rff.gif bitmaps/rff.xpm bitmaps/rflipflop.b bitmaps/roll.b bitmaps/rom.b bitmaps/rotation0_S.gif bitmaps/rotation0_S.xpm bitmaps/rotation180_S.gif bitmaps/rotation180_S.xpm bitmaps/rotation270_S.gif bitmaps/rotation270_S.xpm bitmaps/rotation90_S.gif bitmaps/rotation90_S.xpm bitmaps/rungate10.xbm bitmaps/rungate11.xbm bitmaps/rungate12.xbm bitmaps/rungate13.xbm bitmaps/rungate14.xbm bitmaps/rungate1.xbm bitmaps/rungate2.xbm bitmaps/rungate3.xbm bitmaps/rungate4.xbm bitmaps/rungate5.xbm bitmaps/rungate6.xbm bitmaps/rungate7.xbm bitmaps/rungate8.xbm bitmaps/rungate9.xbm bitmaps/rungateA.xbm bitmaps/rungateB.xbm bitmaps/rungateC.xbm bitmaps/scroll.b bitmaps/seg7.b bitmaps/shift.b bitmaps/show_xhair.gif bitmaps/show_xhair.xpm bitmaps/sim_break2.b bitmaps/sim_break.gif bitmaps/sim_break.xpm bitmaps/sim_clock.gif bitmaps/sim_clock.xpm bitmaps/sim_dump.gif bitmaps/sim_dump.xpm bitmaps/sim_go.b bitmaps/sim_go.gif bitmaps/sim_load.gif bitmaps/sim_load.xpm bitmaps/sim_pause.b bitmaps/sim_pause.gif bitmaps/sim_script.gif bitmaps/sim_script.xpm bitmaps/simstart.gif bitmaps/simstart.xpm bitmaps/sim_step.b bitmaps/sim_step.gif bitmaps/sim_stop.b bitmaps/sim_stop.gif bitmaps/size_curs.b bitmaps/smallcurs.b bitmaps/smalldot.b bitmaps/smalllogo.xbm bitmaps/strek.b bitmaps/switch.b bitmaps/tap.b bitmaps/trek.b bitmaps/tty.b bitmaps/txtcurs.b bitmaps/Udemuxord1.gif bitmaps/Udemuxord2.gif bitmaps/Udemuxsel1.gif bitmaps/Udemuxsel2.gif bitmaps/Uff.gif bitmaps/Uled_bar.gif bitmaps/Uled_bit.gif bitmaps/Uled_dec.gif bitmaps/Uled_direct.gif bitmaps/Uled_hex.gif bitmaps/Umuxord1.gif bitmaps/Umuxord2.gif bitmaps/Umuxsel1.gif bitmaps/Umuxsel2.gif bitmaps/Urff.gif bitmaps/vdd.b bitmaps/xor.b bitmaps/zoom_in.gif bitmaps/zoom_in.xpm bitmaps/zoom_out.gif bitmaps/zoom_out.xpm
+ #define TKGATE_SCRIPTS		scripts/action.tcl scripts/bitedit.tcl scripts/blocklist.tcl scripts/circuit.tcl scripts/commands.tcl scripts/cpath.tcl scripts/dip.tcl scripts/dragger.tcl scripts/dropbox.tcl scripts/editgate.tcl scripts/editnets.tcl scripts/elistbox.tcl scripts/errbox.tcl scripts/frame.tcl scripts/gcanvas.tcl scripts/helpon.tcl scripts/license.tcl scripts/menu.tcl scripts/message.tcl scripts/misc.tcl scripts/nameframe.tcl scripts/options.tcl scripts/parms.tcl scripts/portlist.tcl scripts/print.tcl scripts/scope.tcl scripts/shortcuts.tcl scripts/simtty.tcl scripts/simulator.tcl scripts/status.tcl scripts/tkgate.tcl scripts/toolbar.tcl scripts/tree.tcl
+ #define TKGATE_DOCS		doc/gateEdit.html doc/gateGmac.html doc/gateIntro.html doc/gateSim.html doc/index.html doc/adding_gate_types.txt doc/license.txt doc/symbols.txt doc/menagerie.gm
+-#define TKGATE_DOCFIGS		doc/fig/anallogo.gif doc/fig/analopts.gif doc/fig/analyze.gif doc/fig/arrow.gif doc/fig/arrow4.gif doc/fig/back.gif doc/fig/balloon.gif doc/fig/biggatelogo.gif doc/fig/blk_close.gif doc/fig/blk_open.gif doc/fig/break.gif doc/fig/chdir.gif doc/fig/circprop.gif doc/fig/coloropts.gif doc/fig/connect1a.gif doc/fig/connect1b.gif doc/fig/connect1c.gif doc/fig/connect1d.gif doc/fig/connect2a.gif doc/fig/connect2b.gif doc/fig/connect2c.gif doc/fig/connect2d.gif doc/fig/cpathcirc.gif doc/fig/cpathdlg.gif doc/fig/create1.gif doc/fig/create2.gif doc/fig/create3.gif doc/fig/create4.gif doc/fig/cretin.gif doc/fig/cretinout.gif doc/fig/cretout.gif doc/fig/cut_curs.gif doc/fig/cutters.gif doc/fig/del_curs.gif doc/fig/dipval.gif doc/fig/edbreak.gif doc/fig/edclock.gif doc/fig/edcomment.gif doc/fig/eddelay.gif doc/fig/edgat.gif doc/fig/ednet.gif doc/fig/edpnet.gif doc/fig/edport.gif doc/fig/file_new.gif doc/fig/file_open.gif doc/fig/file_print.gif doc/fig/file_save.gif doc/fig/filemenu.gif doc/fig/fileopen.gif doc/fig/forward.gif doc/fig/g_add.gif doc/fig/g_and.gif doc/fig/g_arshift.gif doc/fig/g_block.gif doc/fig/g_buf.gif doc/fig/g_bufif.gif doc/fig/g_clock.gif doc/fig/g_comment.gif doc/fig/g_demux.gif doc/fig/g_dip.gif doc/fig/g_div.gif doc/fig/g_ff.gif doc/fig/g_frame.gif doc/fig/g_ground.gif doc/fig/g_led.gif doc/fig/g_lshift.gif doc/fig/g_merge.gif doc/fig/g_mul.gif doc/fig/g_mux.gif doc/fig/g_nmos.gif doc/fig/g_or.gif doc/fig/g_pmos.gif doc/fig/g_ram.gif doc/fig/g_red.gif doc/fig/g_reg.gif doc/fig/g_roll.gif doc/fig/g_rom.gif doc/fig/g_rshift.gif doc/fig/g_supply.gif doc/fig/g_switch.gif doc/fig/g_tap.gif doc/fig/g_tty.gif doc/fig/g_xor.gif doc/fig/gatelogo.gif doc/fig/gateport.gif doc/fig/gatewin.gif doc/fig/gatewin_11.gif doc/fig/gatwin.gif doc/fig/genopts.gif doc/fig/icextract.gif doc/fig/inout.gif doc/fig/inv_curs.gif doc/fig/invaddel.gif doc/fig/label.gif doc/fig/logic.gif doc/fig/logic0.gif doc/fig/logic1.gif doc/fig/logicH.gif doc/fig/logicL.gif doc/fig/logicx.gif doc/fig/logicz.gif doc/fig/makeand.gif doc/fig/manual.gif doc/fig/modcreate.gif doc/fig/mov_curs.gif doc/fig/movgat1.gif doc/fig/movgat2.gif doc/fig/movgrp1.gif doc/fig/movgrp2.gif doc/fig/movgrp3.gif doc/fig/movgrp4.gif doc/fig/nihongo.gif doc/fig/options.gif doc/fig/popcreate.gif doc/fig/powerbsd.gif doc/fig/printdlg.gif doc/fig/printopts.gif doc/fig/ptr.gif doc/fig/rungate1.gif doc/fig/rungate2.gif doc/fig/scope.gif doc/fig/search.gif doc/fig/showval.gif doc/fig/sim_break.gif doc/fig/sim_clock.gif doc/fig/sim_dump.gif doc/fig/sim_go.gif doc/fig/sim_load.gif doc/fig/sim_pause.gif doc/fig/sim_script.gif doc/fig/sim_step.gif doc/fig/sim_stop.gif doc/fig/simerr.gif doc/fig/simopts.gif doc/fig/simprint.gif doc/fig/simstart.gif doc/fig/size_curs.gif doc/fig/small_tkgate.gif doc/fig/smallgatwin.gif doc/fig/smallgenopts.gif doc/fig/solder.gif doc/fig/text.gif doc/fig/tkgate.gif doc/fig/wsize.gif doc/fig/xmark.gif doc/fig/zoom_in.gif doc/fig/zoom_out.gif
++#define TKGATE_DOCFIGS		doc/fig/anallogo.gif doc/fig/analopts.gif doc/fig/analyze.gif doc/fig/arrow4.gif doc/fig/arrow.gif doc/fig/back.gif doc/fig/balloon.gif doc/fig/biggatelogo.gif doc/fig/blk_close.gif doc/fig/blk_open.gif doc/fig/break.gif doc/fig/chdir.gif doc/fig/circprop.gif doc/fig/coloropts.gif doc/fig/connect1a.gif doc/fig/connect1b.gif doc/fig/connect1c.gif doc/fig/connect1d.gif doc/fig/connect2a.gif doc/fig/connect2b.gif doc/fig/connect2c.gif doc/fig/connect2d.gif doc/fig/cpathcirc.gif doc/fig/cpathdlg.gif doc/fig/create1.gif doc/fig/create2.gif doc/fig/create3.gif doc/fig/create4.gif doc/fig/cretin.gif doc/fig/cretinout.gif doc/fig/cretout.gif doc/fig/cut_curs.gif doc/fig/cutters.gif doc/fig/del_curs.gif doc/fig/dipval.gif doc/fig/edbreak.gif doc/fig/edclock.gif doc/fig/edcomment.gif doc/fig/eddelay.gif doc/fig/edgat.gif doc/fig/ednet.gif doc/fig/edpnet.gif doc/fig/edport.gif doc/fig/filemenu.gif doc/fig/file_new.gif doc/fig/file_open.gif doc/fig/fileopen.gif doc/fig/file_print.gif doc/fig/file_save.gif doc/fig/forward.gif doc/fig/g_add.gif doc/fig/g_and.gif doc/fig/g_arshift.gif doc/fig/gatelogo.gif doc/fig/gateport.gif doc/fig/gatewin_11.gif doc/fig/gatewin.gif doc/fig/gatwin.gif doc/fig/g_block.gif doc/fig/g_buf.gif doc/fig/g_bufif.gif doc/fig/g_clock.gif doc/fig/g_comment.gif doc/fig/g_demux.gif doc/fig/g_dip.gif doc/fig/g_div.gif doc/fig/genopts.gif doc/fig/g_ff.gif doc/fig/g_frame.gif doc/fig/g_ground.gif doc/fig/g_led.gif doc/fig/g_lshift.gif doc/fig/g_merge.gif doc/fig/g_mul.gif doc/fig/g_mux.gif doc/fig/g_nmos.gif doc/fig/g_or.gif doc/fig/g_pmos.gif doc/fig/g_ram.gif doc/fig/g_red.gif doc/fig/g_reg.gif doc/fig/g_roll.gif doc/fig/g_rom.gif doc/fig/g_rshift.gif doc/fig/g_supply.gif doc/fig/g_switch.gif doc/fig/g_tap.gif doc/fig/g_tty.gif doc/fig/g_xor.gif doc/fig/icextract.gif doc/fig/inout.gif doc/fig/invaddel.gif doc/fig/inv_curs.gif doc/fig/label.gif doc/fig/logic0.gif doc/fig/logic1.gif doc/fig/logic.gif doc/fig/logicH.gif doc/fig/logicL.gif doc/fig/logicx.gif doc/fig/logicz.gif doc/fig/makeand.gif doc/fig/manual.gif doc/fig/modcreate.gif doc/fig/mov_curs.gif doc/fig/movgat1.gif doc/fig/movgat2.gif doc/fig/movgrp1.gif doc/fig/movgrp2.gif doc/fig/movgrp3.gif doc/fig/movgrp4.gif doc/fig/nihongo.gif doc/fig/options.gif doc/fig/popcreate.gif doc/fig/powerbsd.gif doc/fig/printdlg.gif doc/fig/printopts.gif doc/fig/ptr.gif doc/fig/rungate1.gif doc/fig/rungate2.gif doc/fig/scope.gif doc/fig/search.gif doc/fig/showval.gif doc/fig/sim_break.gif doc/fig/sim_clock.gif doc/fig/sim_dump.gif doc/fig/simerr.gif doc/fig/sim_go.gif doc/fig/sim_load.gif doc/fig/simopts.gif doc/fig/sim_pause.gif doc/fig/simprint.gif doc/fig/sim_script.gif doc/fig/simstart.gif doc/fig/sim_step.gif doc/fig/sim_stop.gif doc/fig/size_curs.gif doc/fig/smallgatwin.gif doc/fig/smallgenopts.gif doc/fig/small_tkgate.gif doc/fig/solder.gif doc/fig/text.gif doc/fig/tkgate.gif doc/fig/wsize.gif doc/fig/xmark.gif doc/fig/zoom_in.gif doc/fig/zoom_out.gif
+ /*** END-AUTO - end of automatically generated section ***/
+ 
+ #define PassCDebugFlags
diff -Nru tkgate-1.8.7/debian/patches/04-manpages.diff tkgate-1.8.7/debian/patches/04-manpages.diff
--- tkgate-1.8.7/debian/patches/04-manpages.diff	1970-01-01 00:00:00.000000000 +0000
+++ tkgate-1.8.7/debian/patches/04-manpages.diff	2011-12-29 10:06:39.000000000 +0000
@@ -0,0 +1,70 @@
+Description: Fix manual pages.
+
+--- tkgate-1.8.7.orig/gmac.man
++++ tkgate-1.8.7/gmac.man
+@@ -3,7 +3,7 @@
+ gmac \- Microcode and Macrocode Compiler for TkGate
+ .SH "SYNOPSIS"
+ .B gmac
+-[-o file] [files]
++[\-o file] [files]
+ 
+ .SH "DESCRIPTION"
+ \fIgmac \fR is a microcode and macrocode compiler for tkgate.  More complete
+@@ -14,7 +14,7 @@ http://www.cs.cmu.edu/~hansen/tkgate
+ .SH "OPTIONS"
+ The options are as follows:
+ .TP 15
+--o file
++\-o file
+ Specifies the output file.
+ 
+ .SH "SEE ALSO"
+--- tkgate-1.8.7.orig/tkgate.man
++++ tkgate-1.8.7/tkgate.man
+@@ -3,7 +3,7 @@
+ tkgate \- Tcl/Tk based digital circuit editor and simulator
+ .SH "SYNOPSIS"
+ .B tkgate
+-[-xqs] [-X script] [-l file] [-p file] [-P printer] [files...]
++[\-xqs] [\-X script] [\-l file] [\-p file] [\-P printer] [files...]
+ .SH "DESCRIPTION"
+ \fITkGate \fR
+ is a graphical editor and event driven simulator for digital circuits
+@@ -21,28 +21,28 @@ http://www.cs.cmu.edu/~hansen/tkgate
+ 
+ The options are as follows:
+ .TP 15
+--X script
++\-X script
+ Automaticaly start the simulator and execute the specified simulation script. 
+ .TP 15
+--p file
++\-p file
+ Print circuit to file without starting GUI.
+ .TP 15
+--P printer
++\-P printer
+ Print circuit to printer without starting GUI.
+ .TP 15
+--l file
++\-l file
+ Read the specified file as a library.
+ .TP 15
+--x
++\-x
+ Automaticaly start the simulator.
+ .TP 15
+--q
++\-q
+ Suppress startup messages.
+ .TP 15
+--s
++\-s
+ Excute with a synchronous X server connection.  This option is primarily for debugging.
+ .TP 15
+--L lang
++\-L lang
+ Specify a locality to use if tkgate has been configued for Japanese
+ support.  The locality should be either "ASCII" for English, or "ja_JP.EUC" for Japanese. This option can also be set via the LANG environment variable.
+ 
diff -Nru tkgate-1.8.7/debian/patches/05-manpages-names.diff tkgate-1.8.7/debian/patches/05-manpages-names.diff
--- tkgate-1.8.7/debian/patches/05-manpages-names.diff	1970-01-01 00:00:00.000000000 +0000
+++ tkgate-1.8.7/debian/patches/05-manpages-names.diff	2011-12-29 10:07:10.000000000 +0000
@@ -0,0 +1,13 @@
+Description: Refer to manual pages by the correct names (is it really needed?)
+
+--- tkgate-1.8.7.orig/tkgate.spec
++++ tkgate-1.8.7/tkgate.spec
+@@ -57,6 +57,6 @@ make install.man
+ /usr/X11R6/bin/tkgate
+ /usr/X11R6/bin/gmac
+ /usr/X11R6/lib/tkgate-1.6i
+-%doc /usr/X11R6/man/man1/tkgate.1x
+-%doc /usr/X11R6/man/man1/gmac.1x
++%doc /usr/X11R6/man/man1/tkgate.1
++%doc /usr/X11R6/man/man1/gmac.1
+ %doc COPYING README doc
diff -Nru tkgate-1.8.7/debian/patches/06-gsim-path.diff tkgate-1.8.7/debian/patches/06-gsim-path.diff
--- tkgate-1.8.7/debian/patches/06-gsim-path.diff	1970-01-01 00:00:00.000000000 +0000
+++ tkgate-1.8.7/debian/patches/06-gsim-path.diff	2011-12-29 10:08:39.000000000 +0000
@@ -0,0 +1,13 @@
+Description: Call gsim correctly.
+
+--- a/scripts/parms.tcl.orig	2008-02-18 22:19:45.000000000 +0200
++++ b/scripts/parms.tcl	2009-09-21 17:37:52.000000000 +0300
+@@ -38,7 +38,7 @@
+ #
+ # Executable for simulator
+ #
+-set simExec "${tkg_gateHome}/libexec/gsim"
++set simExec "/usr/bin/gsim"
+ 
+ set tkg_simCustomDelay 0
+ set tkg_simDefaultDelayFile "${tkg_gateHome}/gdf/default.gdf"
diff -Nru tkgate-1.8.7/debian/patches/07-use-tcltk8.5.diff tkgate-1.8.7/debian/patches/07-use-tcltk8.5.diff
--- tkgate-1.8.7/debian/patches/07-use-tcltk8.5.diff	1970-01-01 00:00:00.000000000 +0000
+++ tkgate-1.8.7/debian/patches/07-use-tcltk8.5.diff	2011-12-29 10:30:38.000000000 +0000
@@ -0,0 +1,27 @@
+Description: Use Tcl/Tk 8.5
+Author: Andrew O. Shadura <bugzilla@tut.by>
+
+--- tkgate-1.8.7.orig/config.h
++++ tkgate-1.8.7/config.h
+@@ -39,7 +39,7 @@
+ /*
+   Tcl/Tk Version numbers to use.
+ */
+-#define TKGATE_TCLTK_VERSIONS		"8.4 8.3 8.2 8.1 8.0"
++#define TKGATE_TCLTK_VERSIONS		"8.5 8.4 8.3 8.2 8.1 8.0"
+ 
+ /*
+   Japanese Tcl/Tk Version numbers to use.
+@@ -326,10 +326,10 @@
+ #define TKGATE_LPATH		 -L/usr/lib
+ #endif
+ #ifndef TKGATE_IPATH
+-#define TKGATE_IPATH		 -I/usr/include/tk8.4 -I/usr/include/tcl8.4
++#define TKGATE_IPATH		 -I/usr/include/tk8.5 -I/usr/include/tcl8.5
+ #endif
+ #ifndef TKGATE_LIBS
+-#define TKGATE_LIBS		 -ltk8.4 -ltcl8.4 -lX11 -lm
++#define TKGATE_LIBS		 -ltk8.5 -ltcl8.5 -lX11 -lm
+ #endif
+ 
+ #ifndef TKGATE_HOMEDIR
diff -Nru tkgate-1.8.7/debian/patches/series tkgate-1.8.7/debian/patches/series
--- tkgate-1.8.7/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ tkgate-1.8.7/debian/patches/series	2011-12-29 10:30:20.000000000 +0000
@@ -0,0 +1,7 @@
+01-path-to-wish.diff
+02-honour-destdir.diff
+03-fix-config.h.diff
+04-manpages.diff
+05-manpages-names.diff
+06-gsim-path.diff
+07-use-tcltk8.5.diff
diff -Nru tkgate-1.8.7/debian/source/format tkgate-1.8.7/debian/source/format
--- tkgate-1.8.7/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ tkgate-1.8.7/debian/source/format	2012-01-09 11:02:08.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru tkgate-1.8.7/gmac.man tkgate-1.8.7/gmac.man
--- tkgate-1.8.7/gmac.man	2012-01-09 11:02:08.000000000 +0000
+++ tkgate-1.8.7/gmac.man	2004-01-07 19:39:13.000000000 +0000
@@ -3,7 +3,7 @@
 gmac \- Microcode and Macrocode Compiler for TkGate
 .SH "SYNOPSIS"
 .B gmac
-[\-o file] [files]
+[-o file] [files]
 
 .SH "DESCRIPTION"
 \fIgmac \fR is a microcode and macrocode compiler for tkgate.  More complete
@@ -14,7 +14,7 @@
 .SH "OPTIONS"
 The options are as follows:
 .TP 15
-\-o file
+-o file
 Specifies the output file.
 
 .SH "SEE ALSO"
diff -Nru tkgate-1.8.7/Imakefile tkgate-1.8.7/Imakefile
--- tkgate-1.8.7/Imakefile	2012-01-09 11:02:08.000000000 +0000
+++ tkgate-1.8.7/Imakefile	2004-06-09 17:16:06.000000000 +0000
@@ -99,4 +99,4 @@
 	@echo "All files from ${HOMEDIR}"
 
 install::
-	cp -r locale ${DESTDIR}${HOMEDIR}
+	cp -r locale ${HOMEDIR}
diff -Nru tkgate-1.8.7/scripts/elistbox.tcl tkgate-1.8.7/scripts/elistbox.tcl
--- tkgate-1.8.7/scripts/elistbox.tcl	2012-01-09 11:02:08.000000000 +0000
+++ tkgate-1.8.7/scripts/elistbox.tcl	2007-01-27 23:06:50.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/wish
+#!/usr/local/bin/wish8.3
 
 set elistbox_debug 0
 
diff -Nru tkgate-1.8.7/tkgate.man tkgate-1.8.7/tkgate.man
--- tkgate-1.8.7/tkgate.man	2012-01-09 11:02:08.000000000 +0000
+++ tkgate-1.8.7/tkgate.man	2004-01-07 19:38:55.000000000 +0000
@@ -3,7 +3,7 @@
 tkgate \- Tcl/Tk based digital circuit editor and simulator
 .SH "SYNOPSIS"
 .B tkgate
-[\-xqs] [\-X script] [\-l file] [\-p file] [\-P printer] [files...]
+[-xqs] [-X script] [-l file] [-p file] [-P printer] [files...]
 .SH "DESCRIPTION"
 \fITkGate \fR
 is a graphical editor and event driven simulator for digital circuits
@@ -21,28 +21,28 @@
 
 The options are as follows:
 .TP 15
-\-X script
+-X script
 Automaticaly start the simulator and execute the specified simulation script. 
 .TP 15
-\-p file
+-p file
 Print circuit to file without starting GUI.
 .TP 15
-\-P printer
+-P printer
 Print circuit to printer without starting GUI.
 .TP 15
-\-l file
+-l file
 Read the specified file as a library.
 .TP 15
-\-x
+-x
 Automaticaly start the simulator.
 .TP 15
-\-q
+-q
 Suppress startup messages.
 .TP 15
-\-s
+-s
 Excute with a synchronous X server connection.  This option is primarily for debugging.
 .TP 15
-\-L lang
+-L lang
 Specify a locality to use if tkgate has been configued for Japanese
 support.  The locality should be either "ASCII" for English, or "ja_JP.EUC" for Japanese. This option can also be set via the LANG environment variable.
 
diff -Nru tkgate-1.8.7/tkgate.spec tkgate-1.8.7/tkgate.spec
--- tkgate-1.8.7/tkgate.spec	2012-01-09 11:02:08.000000000 +0000
+++ tkgate-1.8.7/tkgate.spec	2001-11-26 17:19:16.000000000 +0000
@@ -57,6 +57,6 @@
 /usr/X11R6/bin/tkgate
 /usr/X11R6/bin/gmac
 /usr/X11R6/lib/tkgate-1.6i
-%doc /usr/X11R6/man/man1/tkgate.1
-%doc /usr/X11R6/man/man1/gmac.1
+%doc /usr/X11R6/man/man1/tkgate.1x
+%doc /usr/X11R6/man/man1/gmac.1x
 %doc COPYING README doc