diff -u sqlite-2.8.17/debian/changelog sqlite-2.8.17/debian/changelog
--- sqlite-2.8.17/debian/changelog
+++ sqlite-2.8.17/debian/changelog
@@ -1,3 +1,12 @@
+sqlite (2.8.17-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Moved Tcl package to a subdirectory of /usr/lib/tcltk to make the package
+    compliant to Debian Tcl/Tk policy.
+  * Use the default Tcl version to build the package.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Thu, 17 Jan 2008 11:31:36 +0000
+
 sqlite (2.8.17-4) unstable; urgency=low
 
   * Fixed upstream Makefile.in not to lose doc/lemon.html and
diff -u sqlite-2.8.17/debian/control sqlite-2.8.17/debian/control
--- sqlite-2.8.17/debian/control
+++ sqlite-2.8.17/debian/control
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
-Build-Depends: cdbs (>= 0.4.15), debhelper (>= 4.2.0), autoconf (>= 2.59), libtool (>= 1.5.2), automake1.9, autotools-dev, libreadline5-dev, tcl8.4-dev
+Build-Depends: cdbs (>= 0.4.15), debhelper (>= 4.2.0), autoconf (>= 2.59), libtool (>= 1.5.2), automake1.9, autotools-dev, libreadline5-dev, tcl-dev
 Standards-Version: 3.7.2
 
 Package: sqlite
diff -u sqlite-2.8.17/debian/libsqlite-tcl.dirs sqlite-2.8.17/debian/libsqlite-tcl.dirs
--- sqlite-2.8.17/debian/libsqlite-tcl.dirs
+++ sqlite-2.8.17/debian/libsqlite-tcl.dirs
@@ -1,2 +1 @@
-usr/lib
-usr/lib/sqlite
+usr/lib/tcltk/sqlite
diff -u sqlite-2.8.17/debian/libsqlite-tcl.install sqlite-2.8.17/debian/libsqlite-tcl.install
--- sqlite-2.8.17/debian/libsqlite-tcl.install
+++ sqlite-2.8.17/debian/libsqlite-tcl.install
@@ -1,2 +1,2 @@
-usr/lib/sqlite/libtclsqlite.so.*
-usr/lib/sqlite/pkgIndex.tcl
+usr/lib/sqlite/libtclsqlite.so.* usr/lib/tcltk/sqlite/
+usr/lib/sqlite/pkgIndex.tcl usr/lib/tcltk/sqlite/
diff -u sqlite-2.8.17/debian/rules sqlite-2.8.17/debian/rules
--- sqlite-2.8.17/debian/rules
+++ sqlite-2.8.17/debian/rules
@@ -22,7 +22,7 @@
 DEB_AUTO_UPDATE_AUTOCONF = 2.50
 DEB_AUTO_UPDATE_AUTOMAKE = 1.9 # We don't use automake, but aclocal
 
-DEB_CONFIGURE_EXTRA_FLAGS = config_TARGET_TCL_INC="-I/usr/include/tcl8.4" \
+DEB_CONFIGURE_EXTRA_FLAGS = config_TARGET_TCL_INC="-I/usr/include/tcl" \
 			    config_BUILD_CFLAGS="$(CFLAGS) -DTHREADSAFE=1" \
 			    config_TARGET_LIBS="-lpthread" \
 			    --enable-utf8