diff -u sqlite3-3.4.2/aclocal.m4 sqlite3-3.4.2/aclocal.m4
--- sqlite3-3.4.2/aclocal.m4
+++ sqlite3-3.4.2/aclocal.m4
@@ -13,7 +13,7 @@
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
+# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff -u sqlite3-3.4.2/debian/changelog sqlite3-3.4.2/debian/changelog
--- sqlite3-3.4.2/debian/changelog
+++ sqlite3-3.4.2/debian/changelog
@@ -1,3 +1,12 @@
+sqlite3 (3.4.2-2.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:40:18 +0000
+
 sqlite3 (3.4.2-2) unstable; urgency=low
 
   * Fixed upstream Makefile.in not to lose doc/lemon.html and
diff -u sqlite3-3.4.2/debian/control sqlite3-3.4.2/debian/control
--- sqlite3-3.4.2/debian/control
+++ sqlite3-3.4.2/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.1.16), autoconf (>= 2.59), libtool (>= 1.5.2), automake1.9, autotools-dev, libreadline5-dev, tcl8.4-dev
+Build-Depends: cdbs (>= 0.4.15), debhelper (>= 4.1.16), autoconf (>= 2.59), libtool (>= 1.5.2), automake1.9, autotools-dev, libreadline5-dev, tcl-dev
 Standards-Version: 3.7.2
 
 Package: lemon
@@ -66,7 +66,7 @@
 Suggests: sqlite3-doc
 Section: interpreters
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${tclsh:Depends}
 Description: SQLite 3 TCL bindings
  SQLite is a C library that implements an SQL database engine. 
  Programs that link with the SQLite library can have SQL database 
diff -u sqlite3-3.4.2/debian/libsqlite3-tcl.dirs sqlite3-3.4.2/debian/libsqlite3-tcl.dirs
--- sqlite3-3.4.2/debian/libsqlite3-tcl.dirs
+++ sqlite3-3.4.2/debian/libsqlite3-tcl.dirs
@@ -1,2 +1 @@
-usr/lib
-usr/lib/sqlite3
+usr/lib/tcltk/sqlite3
diff -u sqlite3-3.4.2/debian/libsqlite3-tcl.install sqlite3-3.4.2/debian/libsqlite3-tcl.install
--- sqlite3-3.4.2/debian/libsqlite3-tcl.install
+++ sqlite3-3.4.2/debian/libsqlite3-tcl.install
@@ -1,2 +1,2 @@
-usr/lib/sqlite3/libtclsqlite3.so.*
-usr/lib/sqlite3/pkgIndex.tcl
+usr/lib/sqlite3/libtclsqlite3.so.* usr/lib/tcltk/sqlite3/
+usr/lib/sqlite3/pkgIndex.tcl usr/lib/tcltk/sqlite3/
diff -u sqlite3-3.4.2/debian/rules sqlite3-3.4.2/debian/rules
--- sqlite3-3.4.2/debian/rules
+++ sqlite3-3.4.2/debian/rules
@@ -19,6 +19,7 @@
 	install -m 775 lemon debian/tmp/usr/bin
 	install -d debian/tmp/usr/share/man/man1/
 	install -m 644 sqlite3.1 debian/tmp/usr/share/man/man1
+	tcltk-depends
 
 install/sqlite3-doc::
 	tclsh www/lang.tcl doc/ >doc/lang.html
@@ -27,7 +28,7 @@
 DEB_AUTO_UPDATE_AUTOCONF = 2.50
 DEB_AUTO_UPDATE_AUTOMAKE = 1.9 # We don't use automake, but aclocal
 
-DEB_CONFIGURE_EXTRA_FLAGS = --with-tcl=/usr/lib/tcl8.4 --enable-threadsafe
+DEB_CONFIGURE_EXTRA_FLAGS = --with-tcl=/usr/lib --enable-threadsafe
 
 DEB_BUILD_MAKE_TARGET = all libtclsqlite3.la doc
 #DEB_MAKE_CHECK_TARGET = test
diff -u sqlite3-3.4.2/ltmain.sh sqlite3-3.4.2/ltmain.sh
--- sqlite3-3.4.2/ltmain.sh
+++ sqlite3-3.4.2/ltmain.sh
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.24 Debian 1.5.24-1"
+VERSION="1.5.24 Debian 1.5.24-2"
 TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
diff -u sqlite3-3.4.2/sqlite3.pc sqlite3-3.4.2/sqlite3.pc
--- sqlite3-3.4.2/sqlite3.pc
+++ sqlite3-3.4.2/sqlite3.pc
@@ -8,5 +8,5 @@
 Name: SQLite
 Description: SQL database engine
-Version: 3.4
+Version: 3.4.2
 Libs: -L${libdir} -lsqlite3
 Cflags: -I${includedir}