diff -u tix-8.4.0/debian/changelog tix-8.4.0/debian/changelog
--- tix-8.4.0/debian/changelog
+++ tix-8.4.0/debian/changelog
@@ -1,3 +1,21 @@
+tix (8.4.0-7ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing (LP: #494384). Remaining changes:
+    - debian/watch: fixed download page.
+    - debian/control: bumped Standards-Version to 3.8.3.
+    - debian/control: replaced ${Source-Version} by ${binary:Version} as 
+      tix-dev's Depends to fix a lintian warning: 
+      substvar-source-version-is-deprecated.
+
+ -- Ilya Barygin <barygin@gmail.com>  Wed, 09 Dec 2009 12:02:34 +0300
+
+tix (8.4.0-7) unstable; urgency=low
+
+  * QA upload.
+  * Add ${shlibs:Depends} to tix's Depends line (Closes: #553241).
+
+ -- Matt Kraai <kraai@debian.org>  Sat, 07 Nov 2009 04:43:20 -0800
+
 tix (8.4.0-6ubuntu1) hardy; urgency=low
 
   * debian/watch:
diff -u tix-8.4.0/debian/control tix-8.4.0/debian/control
--- tix-8.4.0/debian/control
+++ tix-8.4.0/debian/control
@@ -1,15 +1,15 @@
 Source: tix
 Section: libs
 Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
 Build-Depends: tcl8.4-dev, tk8.4-dev (>= 8.4.1), debhelper (>= 5)
 
 Package: tix
 Section: libs
 Architecture: any
-Depends: tcl8.4 (>= 8.4.2) | tclsh
+Depends: tcl8.4 (>= 8.4.2) | tclsh, ${shlibs:Depends}
 Conflicts: python2.1-tk (<< 2.1.3-12), python2.2-tk (<< 2.2.2-2), python2.3-tk (<< 2.2.94), tix8.1
 Replaces: tix8.1
 Provides: tix
diff -u tix-8.4.0/debian/watch tix-8.4.0/debian/watch
--- tix-8.4.0/debian/watch
+++ tix-8.4.0/debian/watch
@@ -2,2 +2,2 @@
-
-http://sf.net/tix/tix-([\d\.]*)\.tar\.gz debian uupdate
+http://sf.net/tix/[Tt]ix-?([\d\.]*)\.tar\.gz debian uupdate
+http://sf.net/tix/[Tt]ix-?([\d\.]*)-src\.tar\.gz debian uupdate