diff -u mysqltcl-3.02/debian/control mysqltcl-3.02/debian/control
--- mysqltcl-3.02/debian/control
+++ mysqltcl-3.02/debian/control
@@ -2,12 +2,12 @@
 Section: libs
 Priority: optional
 Maintainer: Sven Hoexter <sven@timegate.de>
-Build-Depends: debhelper (>> 4.0.0), tcl8.4-dev, libmysqlclient15-dev
+Build-Depends: debhelper (>> 4.0.0), tcl-dev, libmysqlclient15-dev
 Standards-Version: 3.7.2
 
 Package: mysqltcl
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${tclsh:Depends}
 Description: Interface to the MySQL database for the Tcl language
  The mysqltcl package provides a Tcl interface to the mysql database system.
  .
diff -u mysqltcl-3.02/debian/rules mysqltcl-3.02/debian/rules
--- mysqltcl-3.02/debian/rules
+++ mysqltcl-3.02/debian/rules
@@ -5,13 +5,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-TCL_VERSION=8.4
-
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-	( C_INCLUDE_PATH=/usr/include/tcl$(TCL_VERSION) ; export C_INCLUDE_PATH ;./configure --prefix=/usr --with-tcl=/usr/lib/tcl8.4/ --with-mysql-lib=/usr/lib --enable-threads)
+	( C_INCLUDE_PATH=/usr/include/tcl ; export C_INCLUDE_PATH ;./configure --prefix=/usr --with-tcl=/usr/lib --with-mysql-lib=/usr/lib --enable-threads)
 
 	touch configure-stamp
 
@@ -20,7 +18,7 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	( C_INCLUDE_PATH=/usr/include/tcl$(TCL_VERSION) ; export C_INCLUDE_PATH ; $(MAKE) )
+	( C_INCLUDE_PATH=/usr/include/tcl ; export C_INCLUDE_PATH ; $(MAKE) )
 	#/usr/bin/docbook-to-man debian/mysqltcl.sgml > mysqltcl.1
 	touch build-stamp
 
@@ -41,6 +39,7 @@
 
 	# Add here commands to install the package into debian/mysqltcl.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/mysqltcl/
+	mv $(CURDIR)/debian/mysqltcl/usr/lib/mysqltcl* $(CURDIR)/debian/mysqltcl/usr/lib/tcltk/
 
 
 # Build architecture-independent files here.
@@ -61,6 +60,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
+	tcltk-depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
diff -u mysqltcl-3.02/debian/changelog mysqltcl-3.02/debian/changelog
--- mysqltcl-3.02/debian/changelog
+++ mysqltcl-3.02/debian/changelog
@@ -1,3 +1,12 @@
+mysqltcl (3.02-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Moved library files to a subdirectory of /usr/lib/tcltk to make the
+    package compliant to Debian Tcl/Tk policy.
+  * Build the package using default Tcl version.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Sun, 13 Jan 2008 19:49:48 +0000
+
 mysqltcl (3.02-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- mysqltcl-3.02.orig/debian/dirs
+++ mysqltcl-3.02/debian/dirs
@@ -0,0 +1 @@
+/usr/lib/tcltk