diff -u password-gorilla-1.4/debian/changelog password-gorilla-1.4/debian/changelog
--- password-gorilla-1.4/debian/changelog
+++ password-gorilla-1.4/debian/changelog
@@ -1,3 +1,10 @@
+password-gorilla (1.4-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Switched to Tcl/Tk 8.5 to match changes in itcl3 and itk3 packages.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Wed, 02 Sep 2009 19:37:02 +0400
+
 password-gorilla (1.4-4) unstable; urgency=low
 
   * Updated maintainer email address
diff -u password-gorilla-1.4/debian/rules password-gorilla-1.4/debian/rules
--- password-gorilla-1.4/debian/rules
+++ password-gorilla-1.4/debian/rules
@@ -6,7 +6,7 @@
 
 configure: configure-stamp
 configure-stamp:
-	./configure
+	./configure --with-wish=/usr/bin/wish8.5
 	touch $@
 
 build: configure-stamp build-stamp
diff -u password-gorilla-1.4/debian/control password-gorilla-1.4/debian/control
--- password-gorilla-1.4/debian/control
+++ password-gorilla-1.4/debian/control
@@ -6,12 +6,12 @@
 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/ext-maint/password-gorilla/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/ext-maint/password-gorilla
 Build-Depends: debhelper (>= 5.0.51~), dpatch
-Build-Depends-Indep: autotools-dev, tk8.4, imagemagick, docbook-to-man
+Build-Depends-Indep: autotools-dev, tk8.5, imagemagick, docbook-to-man
 Standards-Version: 3.8.0
 
 Package: password-gorilla
 Architecture: all
-Depends: tk8.4, itcl3, bwidget, tcl8.4, tcllib
+Depends: tk8.5, itcl3, bwidget, tcllib
 Description: a cross-platform password manager
  The Password Gorilla helps you manage your logins. It stores all your
  user names and passwords, along with login information and other
diff -u password-gorilla-1.4/debian/patches/01_patch-wrong-interpreter-in-twotest-tcl.dpatch password-gorilla-1.4/debian/patches/01_patch-wrong-interpreter-in-twotest-tcl.dpatch
--- password-gorilla-1.4/debian/patches/01_patch-wrong-interpreter-in-twotest-tcl.dpatch
+++ password-gorilla-1.4/debian/patches/01_patch-wrong-interpreter-in-twotest-tcl.dpatch
@@ -3,6 +3,8 @@
 ## <schoenfeld@in-medias-res.com>
 ##
 ## DP: Patches twotest.tcl to use the right interpreter
+## DP: Modified by Sergei Golovan <sgolovan@debian.org> to use tclsh8.5
+## DP: Also, patches other scripts
 
 @DPATCH@
 --- trunk/twofish/twotest.tcl	2006-04-23 19:30:24.000000000 +0200
@@ -14,4 +16,24 @@
-+#!/usr/bin/tclsh8.4
++#!/usr/bin/tclsh8.5
  
  if {[file exists twofish.tcl]} {
      source twofish.tcl
+--- trunk/gorilla.tcl
++++ trunk/gorilla.tcl
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # the next line restarts using wish \
+-exec wish8.4 "$0" ${1+"$@"}
++exec wish8.5 "$0" ${1+"$@"}
+ 
+ #
+ # ----------------------------------------------------------------------
+--- trunk/pwsafe/pwtest.tcl
++++ trunk/pwsafe/pwtest.tcl
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # the next line restarts using tclsh \
+-exec tclsh84 "$0" ${1+"$@"}
++exec tclsh8.5 "$0" ${1+"$@"}
+ 
+ set myDir [file normalize [file dirname [info script]]]
+ set myDirDir [file normalize [file dirname $myDir]]