diff -u tktable2.9-2.9+cvs20060727/debian/changelog tktable2.9-2.9+cvs20060727/debian/changelog
--- tktable2.9-2.9+cvs20060727/debian/changelog
+++ tktable2.9-2.9+cvs20060727/debian/changelog
@@ -1,3 +1,12 @@
+tktable2.9 (2.9+cvs20060727-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Moved the package files to a subdirectory of /usr/lib/tcltk to make it
+    compliant to Debian Tcl/Tk policy.
+  * Built the package using default Tcl development package.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Sun, 13 Jan 2008 15:55:50 +0000
+
 tktable2.9 (2.9+cvs20060727-2) unstable; urgency=low
 
   * Added build-dep on groff
diff -u tktable2.9-2.9+cvs20060727/debian/rules tktable2.9-2.9+cvs20060727/debian/rules
--- tktable2.9-2.9+cvs20060727/debian/rules
+++ tktable2.9-2.9+cvs20060727/debian/rules
@@ -37,7 +37,7 @@
 
 build: build-stamp
 
-build-stamp: CONFIGURE+=--with-tcl=/usr/lib/tcl8.4 --with-tk=/usr/lib/tk8.4 --with-tclinclude=/usr/include/tcl8.4 --with-tkinclude=/usr/include/tcl8.4 --enable-threads
+build-stamp: CONFIGURE+=--with-tcl=/usr/lib --with-tk=/usr/lib --with-tclinclude=/usr/include/tcl --with-tkinclude=/usr/include/tcl --enable-threads
 build-stamp:
 	dh_testdir
 	autoconf
@@ -74,9 +74,9 @@
 	dh_installchangelogs ChangeLog
 	dh_installdocs	-a
 	dh_installexamples -p$(lib) ./demos/*
-	dh_install -p$(lib) ./library/tkTable.tcl ./pkgIndex.tcl $(lbase)$(ver).so usr/lib/$(base)$(ver)
-	# dh_install -p$(dev) $(lbase)$(ver).a usr/lib/$(base)$(ver)
-	chmod 0644 ./debian/$(lib)/usr/lib/Tktable2.9/tkTable.tcl
+	dh_install -p$(lib) ./library/tkTable.tcl ./pkgIndex.tcl $(lbase)$(ver).so usr/lib/tcltk/$(base)$(ver)
+	# dh_install -p$(dev) $(lbase)$(ver).a usr/lib/tcltk/$(base)$(ver)
+	chmod 0644 ./debian/$(lib)/usr/lib/tcltk/$(base)$(ver)/tkTable.tcl
 	cd ./debian/$(lib)/usr/share/doc/$(lib)/examples/ && chmod 0644 tcllogo.gif loadtable.tcl
 	dh_installman -p$(lib) doc/tkTable.n
 	dh_link -a
@@ -85,6 +85,7 @@
 	dh_fixperms -a
 	dh_installdeb
 	dh_shlibdeps
+	tcltk-depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
diff -u tktable2.9-2.9+cvs20060727/debian/control tktable2.9-2.9+cvs20060727/debian/control
--- tktable2.9-2.9+cvs20060727/debian/control
+++ tktable2.9-2.9+cvs20060727/debian/control
@@ -2,7 +2,7 @@
 Priority: optional
 Maintainer: Justin Pryzby <justinpryzby@users.sf.net>
 Uploaders: Lars Steinke <lss@debian.org>
-Build-Depends: debhelper (>> 4.0.0), tcl8.4-dev, tk8.4-dev, autoconf, groff
+Build-Depends: debhelper (>> 4.0.0), tcl-dev, tk-dev, autoconf, groff
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.7.2
 Section: interpreters
@@ -10,7 +10,7 @@
 Package: libtktable2.9
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, tcl|tcl8.4|tcl8.3, tk|tk8.4|tk8.3
+Depends: ${shlibs:Depends}, ${tclsh:Depends}, ${wish:Depends}
 Replaces: tktable, tktable-dev, libtktable, libtktable-dev
 Conflicts: tktable, tktable-dev, libtktable, libtktable-dev
 Description: Table extension for Tcl/Tk