diff -u pgtcl-1.5/debian/control pgtcl-1.5/debian/control
--- pgtcl-1.5/debian/control
+++ pgtcl-1.5/debian/control
@@ -1,12 +1,12 @@
 Source: pgtcl
 Priority: optional
 Maintainer: Martin Pitt <mpitt@debian.org>
-Build-Depends: cdbs, debhelper (>= 4.0.0), tcl8.4-dev, libpq-dev
+Build-Depends: cdbs, debhelper (>= 4.0.0), tcl-dev, libpq-dev
 Standards-Version: 3.6.2
 Section: libs
 
 Package: libpgtcl1.5
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${tclsh:Depends}
 Conflicts: libpgtcl
 Provides: libpgtcl
 Replaces: libpgtcl
@@ -21,7 +21,7 @@
 Package: libpgtcl-dev
 Section: libdevel
 Architecture: any
-Depends: libpgtcl1.5, tcl8.4-dev
+Depends: libpgtcl1.5, tcl-dev
 Description: Tcl client library binding for PostgreSQL - development files
  This library provides Tcl bindings to the PostgreSQL client library (libpq),
  which is used to communicate with the PostgreSQL database server. 
diff -u pgtcl-1.5/debian/rules pgtcl-1.5/debian/rules
--- pgtcl-1.5/debian/rules
+++ pgtcl-1.5/debian/rules
@@ -6,5 +6,5 @@
-#Set tcl version here
-TCLVERSION = 8.4
-
-DEB_CONFIGURE_EXTRA_FLAGS := --with-tcl=/usr/lib/tcl$(TCLVERSION) --with-tclinclude=/usr/include/tcl$(TCLVERSION)
+DEB_CONFIGURE_EXTRA_FLAGS := --with-tcl=/usr/lib --with-tclinclude=/usr/include/tcl
 DEB_MAKE_INSTALL_TARGET := install-binaries DESTDIR=$(DEB_DESTDIR)
+
+install/libpgtcl1.5::
+	tcltk-depends
diff -u pgtcl-1.5/debian/changelog pgtcl-1.5/debian/changelog
--- pgtcl-1.5/debian/changelog
+++ pgtcl-1.5/debian/changelog
@@ -1,3 +1,12 @@
+pgtcl (1:1.5-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Moved the library 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 20:00:51 +0000
+
 pgtcl (1:1.5-3) unstable; urgency=low
 
   * Add debian/patches/01_fix_configure_syntax.patch:
diff -u pgtcl-1.5/debian/libpgtcl1.5.install pgtcl-1.5/debian/libpgtcl1.5.install
--- pgtcl-1.5/debian/libpgtcl1.5.install
+++ pgtcl-1.5/debian/libpgtcl1.5.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*/* usr/lib/libpgtcl1.5/
+debian/tmp/usr/lib/*/* usr/lib/tcltk/libpgtcl1.5/