diff -Nru debian-faq-4.0.4ubuntu1/debian/changelog debian-faq-4.0.4+nmu1ubuntu1/debian/changelog
--- debian-faq-4.0.4ubuntu1/debian/changelog	2008-09-23 19:44:22.000000000 +0100
+++ debian-faq-4.0.4+nmu1ubuntu1/debian/changelog	2010-03-04 04:25:59.000000000 +0000
@@ -1,3 +1,19 @@
+debian-faq (4.0.4+nmu1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes:
+  Don't add "byhand" files as soyuz doesn't support them
+
+  * Fixes (LP: #531711)
+
+ -- Matt Wheeler <m@funkyhat.org>  Thu, 04 Mar 2010 04:24:43 +0000
+
+debian-faq (4.0.4+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update dependencies for tetex-bin removal (Closes: #562298)
+
+ -- Christoph Egger <christoph@debian.org>  Sun, 03 Jan 2010 16:58:54 +0100
+
 debian-faq (4.0.4ubuntu1) intrepid; urgency=low
 
   * debian/rules:
@@ -671,7 +687,7 @@
     version at /usr/share/doc/debian/mailing-lists.txt for now (Bug #59136).
 
  -- Santiago Vila <sanvila@ctv.es>  Thu,  2 Mar 2000 16:57:39 +0100
- 
+
 doc-debian (2.1) frozen unstable; urgency=low
 
   * Removed outdated information about the kernel-source packages (Bug #33469).
@@ -682,14 +698,14 @@
   * Standards-Version: 3.1.1.
 
  -- Santiago Vila <sanvila@ctv.es>  Sat,  5 Feb 2000 18:49:15 +0100
- 
+
 doc-debian (2.0.1) unstable; urgency=low
 
   * Refreshed doc directory from ftp.debian.org.
   * Updated figures about disk space for mirroring.
 
  -- Santiago Vila <sanvila@ctv.es>  Fri, 12 Nov 1999 13:14:50 +0100
- 
+
 doc-debian (2.0.0) unstable; urgency=low
 
   * Updated information about make-kpkg (Bug #38106).
@@ -858,24 +874,14 @@
  -- Sven Rudolph <sr1@inf.tu-dresden.de>  Thu, 26 Sep 1996 22:09:30 +0200
 
 Mon Aug 26 21:05:52 1996  Sven Rudolph <sr1@inf.tu-dresden.de>
-
 	* FAQ and other files updated
-
 Fri Jun 14 02:19:07 1996    Sven Rudolph <sr1@inf.tu-dresden.de>
-
 	* releasing 1.0-3
-
 	* FAQ updated
-
 Thu Mar 14 xx:xx:xx 1996    Sven Rudolph <sr1@inf.tu-dresden.de>
-
 	* gzipping all files
-
 	* debian.control: added Architecture field
-
 	* debian.control: formatted Description
-
 Wed Feb 21 22:53:06 1996    Sven Rudolph <sr1@inf.tu-dresden.de>
-
 	* added Debian GNU/Linux package maintenance system files
 
diff -Nru debian-faq-4.0.4ubuntu1/debian/control debian-faq-4.0.4+nmu1ubuntu1/debian/control
--- debian-faq-4.0.4ubuntu1/debian/control	2008-09-23 19:44:27.000000000 +0100
+++ debian-faq-4.0.4+nmu1ubuntu1/debian/control	2010-02-06 06:22:30.000000000 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Javier Fernandez-Sanguino Pen~a <jfs@debian.org>
 Uploaders: Pierre Machard <pmachard@debian.org>, Josip Rodin <joy-packages@debian.org>, Joost van Baal <joostvb@debian.org>
 Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: debiandoc-sgml, tetex-bin, tetex-extra, latex-cjk-chinese,
+Build-Depends-Indep: debiandoc-sgml, texlive (>= 2007-11), texlive-latex-extra, latex-cjk-chinese,
  latex-cjk-chinese-arphic-bkai00mp, latex-cjk-chinese-arphic-bsmi00lp,
  latex-cjk-chinese-arphic-gbsn00lp, latex-cjk-chinese-arphic-gkai00mp
 Standards-Version: 3.7.3