diff -u tclxml-3.1/debian/rules tclxml-3.1/debian/rules
--- tclxml-3.1/debian/rules
+++ tclxml-3.1/debian/rules
@@ -24,8 +24,8 @@
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-tcl=/usr/lib/tcl8.4/ --enable-threads --enable-shared 
-	( cd libxml2 ; ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-tcl=/usr/lib/tcl8.4/ --with-Tclxml=.. --enable-threads --enable-shared )
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-tcl=/usr/lib --enable-threads --enable-shared 
+	( cd libxml2 ; ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-tcl=/usr/lib --with-Tclxml=.. --enable-threads --enable-shared )
 
 build: build-stamp
 build-stamp:  config.status
@@ -61,6 +61,9 @@
 	# Add here commands to install the package into debian/tmp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tclxml/
 	( cd libxml2 ; $(MAKE) install DESTDIR=$(CURDIR)/debian/tclxml/ )
+	mv $(CURDIR)/debian/tclxml/usr/lib/TclXML_libxml2* $(CURDIR)/debian/tclxml/usr/lib/tcltk/
+	mv $(CURDIR)/debian/tclxml/usr/lib/Tclxml[0-9]* $(CURDIR)/debian/tclxml/usr/lib/tcltk/
+	sed -i -e's:/usr/lib/:/usr/lib/tcltk/:g' $(CURDIR)/debian/tclxml/usr/lib/TclxmlConfig.sh
 	find debian/tclxml -depth -type d -empty -exec rmdir {} \;
 
 
@@ -96,6 +99,7 @@
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
+	tcltk-depends
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
diff -u tclxml-3.1/debian/control tclxml-3.1/debian/control
--- tclxml-3.1/debian/control
+++ tclxml-3.1/debian/control
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Fernando Ike de Oliveira <fike@midstorm.org>
-Build-Depends: debhelper (>= 5.0.0), tcl8.4-dev, libxml2-dev, expat, tcllib
+Build-Depends: debhelper (>= 5.0.0), tcl-dev, libxml2-dev, expat, tcllib
 Standards-Version: 3.7.2
 
 Package: tclxml
 Architecture: any
-Depends: ${shlibs:Depends}, tcllib
+Depends: ${shlibs:Depends}, ${tclsh:Depends}, tcllib
 Description: Tcl library for XML parsing
  TclXML provides event-based parsing of XML documents.  The
  application may register callback scripts for certain document
diff -u tclxml-3.1/debian/changelog tclxml-3.1/debian/changelog
--- tclxml-3.1/debian/changelog
+++ tclxml-3.1/debian/changelog
@@ -1,3 +1,12 @@
+tclxml (3.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Moved the package libraries to a subdirectory of /usr/lib/tcltk to make
+    the package compliant to Debian Tcl/Tk policy.
+  * Build the package using default Tcl installation.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Sun, 13 Jan 2008 15:30:47 +0000
+
 tclxml (3.1-2) unstable; urgency=low
 
   * Bug fix: fix directory build package. (Closes: #402791)
only in patch2:
unchanged:
--- tclxml-3.1.orig/TclxmlConfig.sh
+++ tclxml-3.1/TclxmlConfig.sh
@@ -22,7 +22,7 @@
 
 # String to pass to linker to pick up the Tclxml library from its
 # build directory.
-Tclxml_BUILD_LIB_SPEC='-L/home/fike/develop/debian/tclxml/tclxml-3.1 -lTclxml3.1'
+Tclxml_BUILD_LIB_SPEC='-L/home/sergei/debian/nmu/tclxml/tclxml-3.1 -lTclxml3.1'
 
 # String to pass to linker to pick up the Tclxml library from its
 # installed directory.
@@ -33,7 +33,7 @@
 
 # String to pass to linker to pick up the Tclxml stub library from its
 # build directory.
-Tclxml_BUILD_STUB_LIB_SPEC='-L/home/fike/develop/debian/tclxml/tclxml-3.1 -lTclxmlstub3.1'
+Tclxml_BUILD_STUB_LIB_SPEC='-L/home/sergei/debian/nmu/tclxml/tclxml-3.1 -lTclxmlstub3.1'
 
 # String to pass to linker to pick up the Tclxml stub library from its
 # installed directory.
@@ -41,7 +41,7 @@
 
 # String to pass to linker to pick up the Tclxml stub library from its
 # build directory.
-Tclxml_BUILD_STUB_LIB_PATH='/home/fike/develop/debian/tclxml/tclxml-3.1/libTclxmlstub3.1.a'
+Tclxml_BUILD_STUB_LIB_PATH='/home/sergei/debian/nmu/tclxml/tclxml-3.1/libTclxmlstub3.1.a'
 
 # String to pass to linker to pick up the Tclxml stub library from its
 # installed directory.
only in patch2:
unchanged:
--- tclxml-3.1.orig/debian/dirs
+++ tclxml-3.1/debian/dirs
@@ -1,2 +1,3 @@
 usr/bin
 usr/sbin
+usr/lib/tcltk