diff -u tcltls-1.5.0.dfsg/debian/control tcltls-1.5.0.dfsg/debian/control
--- tcltls-1.5.0.dfsg/debian/control
+++ tcltls-1.5.0.dfsg/debian/control
@@ -2,13 +2,13 @@
 Section: libs
 Priority: optional
 Maintainer: Muammar El Khatib <muammarelkhatib@gmail.com>
-Build-Depends: debhelper (>= 5), libssl-dev, autotools-dev, tcl8.5-dev, dpatch
+Build-Depends: debhelper (>= 5), libssl-dev, autotools-dev, tcl-dev, dpatch
 Standards-Version: 3.7.3
 Homepage: http://tls.sourceforge.net
 
 Package: tcltls
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.4 | tcl8.5
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${tclsh:Depends}
 Description: the TLS OpenSSL extension to Tcl
  This package enables communication over SSL-encrypted channels in Tcl.
  .
diff -u tcltls-1.5.0.dfsg/debian/changelog tcltls-1.5.0.dfsg/debian/changelog
--- tcltls-1.5.0.dfsg/debian/changelog
+++ tcltls-1.5.0.dfsg/debian/changelog
@@ -1,3 +1,12 @@
+tcltls (1.5.0.dfsg-7.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Moved the library files to a subdirectory of /usr/lib/tcltk to make the
+    package compliant to Debian Tcl/Tk policy.
+  * Switched to build with the default version of Tcl package.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Tue, 15 Jan 2008 13:23:19 +0000
+
 tcltls (1.5.0.dfsg-7) unstable; urgency=low
 
   * Bump Standards-Version to 3.7.3 
diff -u tcltls-1.5.0.dfsg/debian/patches/02_change_pkgIndex.dpatch tcltls-1.5.0.dfsg/debian/patches/02_change_pkgIndex.dpatch
--- tcltls-1.5.0.dfsg/debian/patches/02_change_pkgIndex.dpatch
+++ tcltls-1.5.0.dfsg/debian/patches/02_change_pkgIndex.dpatch
@@ -14,3 +14,3 @@
 -package ifneeded tls 1.5 "[list load [file join $dir .. libtls1.50.so] ] ; [list source [file join $dir tls.tcl] ]"
-+package ifneeded tls 1.50 "[list load [file join $dir .. libtls1.50.so] ] ; [list source [file join $dir tls.tcl] ]"
++package ifneeded tls 1.50 "[list load [file join $dir .. .. libtls1.50.so] ] ; [list source [file join $dir tls.tcl] ]"
  
diff -u tcltls-1.5.0.dfsg/debian/patches/03_change_pkgIndex.in.dpatch tcltls-1.5.0.dfsg/debian/patches/03_change_pkgIndex.in.dpatch
--- tcltls-1.5.0.dfsg/debian/patches/03_change_pkgIndex.in.dpatch
+++ tcltls-1.5.0.dfsg/debian/patches/03_change_pkgIndex.in.dpatch
@@ -15,3 +15,3 @@
 -package ifneeded tls 1.5 "[list load [file join $dir @RELPATH@ @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]"
-+package ifneeded tls 1.50 "[list load [file join $dir .. libtls1.50.so] ] ; [list source [file join $dir tls.tcl] ]"
++package ifneeded tls 1.50 "[list load [file join $dir .. .. @tls_LIB_FILE@] ] ; [list source [file join $dir tls.tcl] ]"
  
diff -u tcltls-1.5.0.dfsg/debian/rules tcltls-1.5.0.dfsg/debian/rules
--- tcltls-1.5.0.dfsg/debian/rules
+++ tcltls-1.5.0.dfsg/debian/rules
@@ -39,8 +39,8 @@
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--with-ssl-dir=/usr \
-		--with-tcl=/usr/lib/tcl8.5 \
-		--with-tclinclude=/usr/include/tcl8.5
+		--with-tcl=/usr/lib \
+		--with-tclinclude=/usr/include/tcl
 
 build: patch-stamp build-stamp
 
@@ -70,6 +70,8 @@
 
 	# Add here commands to install the package into debian/tcltls.
 	$(MAKE) install prefix=$(CURDIR)/debian/tcltls/usr
+	install -d -m 755 $(CURDIR)/debian/tcltls/usr/lib/tcltk
+	mv $(CURDIR)/debian/tcltls/usr/lib/tls* $(CURDIR)/debian/tcltls/usr/lib/tcltk
 	install -m 0644 libtls1.50.so \
 		$(CURDIR)/debian/tcltls/usr/lib/libtls1.50.so
 	install -D -m 0644 debian/tcltls.override \
@@ -96,6 +98,7 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
+	tcltk-depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb