diff -u wavesurfer-1.8.5/debian/changelog wavesurfer-1.8.5/debian/changelog
--- wavesurfer-1.8.5/debian/changelog
+++ wavesurfer-1.8.5/debian/changelog
@@ -1,3 +1,12 @@
+wavesurfer (1.8.5-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Moved Tcl libraries to a subdirectory of /usr/share to make the package
+    working according to Debian Tcl/Tk policy and not to influent any other
+    Tcl packages.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Tue, 15 Jan 2008 14:35:18 +0000
+
 wavesurfer (1.8.5-2) unstable; urgency=low
 
   * Fixed multi channel mode for n-waveform (closes: #410276)
diff -u wavesurfer-1.8.5/debian/rules wavesurfer-1.8.5/debian/rules
--- wavesurfer-1.8.5/debian/rules
+++ wavesurfer-1.8.5/debian/rules
@@ -12 +11,0 @@
-
diff -u wavesurfer-1.8.5/debian/install wavesurfer-1.8.5/debian/install
--- wavesurfer-1.8.5/debian/install
+++ wavesurfer-1.8.5/debian/install
@@ -1,5 +1,5 @@
 build-tree/*/wavesurfer  usr/bin/
-build-tree/*/wsurf*/     usr/lib/
-build-tree/*/plugins     usr/lib/wsurf1.8
+build-tree/*/wsurf*/     usr/share/
+build-tree/*/plugins     usr/share/wsurf1.8
 build-tree/*/doc         usr/share/doc/wavesurfer
 debian/ws32.xpm          usr/share/pixmaps
only in patch2:
unchanged:
--- wavesurfer-1.8.5.orig/debian/patches/03_auto_path.patch
+++ wavesurfer-1.8.5/debian/patches/03_auto_path.patch
@@ -0,0 +1,12 @@
+diff -Nur wavesurfer-1.8.5/wsurf1.8/wavesurfer.tcl.old wavesurfer-1.8.5/wsurf1.8/configurations/wavesurfer.tcl
+--- wavesurfer-1.8.5/wsurf1.8/wavesurfer.tcl.old
++++ wavesurfer-1.8.5/wsurf1.8/wavesurfer.tcl
+@@ -21,7 +21,7 @@
+  set dir $wrap(dir)
+  set auto_path "[file join $dir snack] [file join $dir wsurf] $auto_path"
+ } else {
+- set auto_path [concat [list [file dirname [info script]]] $auto_path]
++ set auto_path [concat [list /usr/share/wsurf1.8] $auto_path]
+ }
+ 
+ package require tkcon