diff -u tclx8.4-8.4.0/debian/changelog tclx8.4-8.4.0/debian/changelog
--- tclx8.4-8.4.0/debian/changelog
+++ tclx8.4-8.4.0/debian/changelog
@@ -1,3 +1,11 @@
+tclx8.4 (8.4.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Moved Tcl part of TclX library to a subdirectory of /usr/share/tcltk to
+    make the package compliant to Debian Tcl/Tk policy.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Fri, 08 Feb 2008 21:04:54 +0300
+
 tclx8.4 (8.4.0-1) unstable; urgency=low
 
   * Official upstream release.
diff -u tclx8.4-8.4.0/debian/rules tclx8.4-8.4.0/debian/rules
--- tclx8.4-8.4.0/debian/rules
+++ tclx8.4-8.4.0/debian/rules
@@ -139,6 +139,9 @@
 	sed 's|\$$dir|/usr/lib|' < pkgIndex.tcl \
 	    > $(DESTDIR)/usr/lib/tclx$(TCLX_VERSION)/pkgIndex.tcl
 
+	install -d -m 755 $(DESTDIR)/usr/share/tcltk/
+	mv $(DESTDIR)/usr/lib/tclx$(TCLX_VERSION) $(DESTDIR)/usr/share/tcltk/
+
 	# Copy files in packages directories
 	dh_install -v --sourcedir=debian/tmp
 
diff -u tclx8.4-8.4.0/debian/tclx8.4.install tclx8.4-8.4.0/debian/tclx8.4.install
--- tclx8.4-8.4.0/debian/tclx8.4.install
+++ tclx8.4-8.4.0/debian/tclx8.4.install
@@ -2 +2 @@
-usr/lib/tclx*/*.tcl
+usr/share/tcltk/tclx*/*.tcl
diff -u tclx8.4-8.4.0/debian/tclx8.4.dirs tclx8.4-8.4.0/debian/tclx8.4.dirs
--- tclx8.4-8.4.0/debian/tclx8.4.dirs
+++ tclx8.4-8.4.0/debian/tclx8.4.dirs
@@ -1 +1 @@
-usr/lib/tclx8.4
+usr/share/tcltk/tclx8.4