diff -u sqlrelay-0.38/debian/control sqlrelay-0.38/debian/control
--- sqlrelay-0.38/debian/control
+++ sqlrelay-0.38/debian/control
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Maintainer: Matthias Klose <doko@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libmysqlclient15-dev, freetds-dev, libiodbc2-dev, libpq-dev, libsqlite0-dev, mdbtools-dev (>= 0.5.99.0.6pre1.0.20051109-2.1), python-all-dev (>= 2.3.5-11), python-central (>= 0.5), libpcre3-dev, libssl-dev, libxml2-dev, librudiments-dev (>= 0.30), libreadline5-dev, libgtk1.2-dev, ruby, ruby1.8-dev, tcl8.4-dev, php5-dev, autotools-dev, chrpath, java-gcj-compat-dev [!arm !mips !mipsel], zope-debhelper
+Build-Depends: debhelper (>= 5.0.37.2), libmysqlclient15-dev, freetds-dev, libiodbc2-dev, libpq-dev, libsqlite0-dev, mdbtools-dev (>= 0.5.99.0.6pre1.0.20051109-2.1), python-all-dev (>= 2.3.5-11), python-central (>= 0.5), libpcre3-dev, libssl-dev, libxml2-dev, librudiments-dev (>= 0.30), libreadline5-dev, libgtk1.2-dev, ruby, ruby1.8-dev, tcl-dev, php5-dev, autotools-dev, chrpath, java-gcj-compat-dev [!arm !mips !mipsel], zope-debhelper
 XS-Python-Version: current
 Standards-Version: 3.7.2
 
@@ -238,7 +238,7 @@
 
 Package: libsqlrelay-tcl
 Architecture: any
-Depends: tcl8.4, sqlrelay (= ${binary:Version}), ${shlibs:Depends}
+Depends: sqlrelay (= ${binary:Version}), ${shlibs:Depends}, ${tclsh:Depends}
 Suggests: sqlrelay-doc
 Provides: sqlrelay-api
 Description: SQL Relay Tcl API
diff -u sqlrelay-0.38/debian/changelog sqlrelay-0.38/debian/changelog
--- sqlrelay-0.38/debian/changelog
+++ sqlrelay-0.38/debian/changelog
@@ -1,3 +1,12 @@
+sqlrelay (1:0.38-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Moved Tcl package files to a subdirectory of /usr/lib/tcltk to make the
+    package compliant to Debian Tcl/Tk policy.
+  * Build the package using the default Tcl version.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Thu, 17 Jan 2008 11:55:23 +0000
+
 sqlrelay (1:0.38-3) unstable; urgency=low
 
   * Don't install files in /usr/lib64. Closes: #417045.
diff -u sqlrelay-0.38/debian/libsqlrelay-tcl.install sqlrelay-0.38/debian/libsqlrelay-tcl.install
--- sqlrelay-0.38/debian/libsqlrelay-tcl.install
+++ sqlrelay-0.38/debian/libsqlrelay-tcl.install
@@ -1,2 +1,2 @@
-usr/lib/sqlrelay/sqlrelay.so
-usr/lib/sqlrelay/pkgIndex.tcl
+usr/lib/sqlrelay/sqlrelay.so usr/lib/tcltk/sqlrelay/
+usr/lib/sqlrelay/pkgIndex.tcl usr/lib/tcltk/sqlrelay/
diff -u sqlrelay-0.38/debian/rules sqlrelay-0.38/debian/rules
--- sqlrelay-0.38/debian/rules
+++ sqlrelay-0.38/debian/rules
@@ -345,6 +345,7 @@
 	rm -f debian/shlibs.local
 	dh_shlibdeps -p$(libpkg)
 	echo "php:Depends=phpapi-$(phpapiver)" >> debian/php5-sqlrelay.substvars
+	tcltk-depends -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a