diff -u texlive-extra-2009/debian/changelog texlive-extra-2009/debian/changelog
--- texlive-extra-2009/debian/changelog
+++ texlive-extra-2009/debian/changelog
@@ -1,3 +1,23 @@
+texlive-extra (2009-10ubuntu1) natty; urgency=low
+
+  * Merge with Debian testing (LP: #691009); remaining Ubuntu changes:
+    - debian/control: Drop texpower from Recommends to Suggests. It is in
+      universe, and drags in context and xpdf.
+    - debian/control: drop texlive-extra-utils new Recommends of xindy to
+      Suggests, to avoid pulling clisp into main.
+    - debian/control: Drop purifyeps from texlive-extra-utils'
+      Recommends to Suggests; purifyeps and a bunch of dependencies are
+      in universe.
+    - Install latex2man, eplain info pages.
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>  Thu, 16 Dec 2010 09:28:10 +0000
+
+texlive-extra (2009-10) unstable; urgency=low
+
+  * add the forgotten epoch for musixtex dependency (Closes: #587746)
+
+ -- Norbert Preining <preining@debian.org>  Tue, 07 Sep 2010 18:06:57 +0900
+
 texlive-extra (2009-9ubuntu1) maverick; urgency=low
 
   * Merge with Debian testing (LP: #618546); remaining Ubuntu changes:
diff -u texlive-extra-2009/debian/control texlive-extra-2009/debian/control
--- texlive-extra-2009/debian/control
+++ texlive-extra-2009/debian/control
@@ -1079,7 +1079,7 @@
 
 Package: texlive-music
 Architecture: all
-Depends: ${misc:Depends}, musixtex (>= 0.114-2), texlive-common (>= 2009-1), texlive-latex-base (>= 2009-1)
+Depends: ${misc:Depends}, musixtex (>= 1:0.114-2), texlive-common (>= 2009-1), texlive-latex-base (>= 2009-1)
 Description: TeX Live: Music typesetting
  Music-related fonts and packages.
  .
diff -u texlive-extra-2009/debian/preinst.pre texlive-extra-2009/debian/preinst.pre
--- texlive-extra-2009/debian/preinst.pre
+++ texlive-extra-2009/debian/preinst.pre
@@ -1,5 +1,5 @@
 # preinst.pre
-# $Id: preinst.pre 3943 2009-05-22 12:11:09Z preining $
+# $Id: preinst.pre 2583 2007-03-15 20:12:56Z frank $
 # we want to be sure that experimental versions are purged before
 # the first unstable is installed
 # furthermore check that we are at least at version 2005 for the 
diff -u texlive-extra-2009/debian/update-link-files.sh texlive-extra-2009/debian/update-link-files.sh
--- texlive-extra-2009/debian/update-link-files.sh
+++ texlive-extra-2009/debian/update-link-files.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # update-link-files.sh
-# $Id: update-link-files.sh 3943 2009-05-22 12:11:09Z preining $
+# $Id: update-link-files.sh 2583 2007-03-15 20:12:56Z frank $
 #
 # This script serves two purposes:
 # 1) it copies the content of $package.links.dist to $package.links
diff -u texlive-extra-2009/debian/CHANGES.packaging texlive-extra-2009/debian/CHANGES.packaging
--- texlive-extra-2009/debian/CHANGES.packaging
+++ texlive-extra-2009/debian/CHANGES.packaging
@@ -1,9 +1,38 @@
 #
 # ChangeLog for tpm2deb.pl and relatives
 #
-# $Id: CHANGES.packaging 4650 2010-07-01 04:49:33Z preining $
+# $Id: CHANGES.packaging 4701 2010-09-07 09:10:14Z preining $
 #
 
+release texlive-extra 2009-10 unstable
+release texlive-base 2009-11 unstable
+
+2010-08-11
+
+  * [base] make texlive-base conflict with texlive-base-bin-doc to get
+    it removed (Closes: #589205)
+  * [base] avoid unneeded 10texlive-base.cnfpre-edit files in /etc/texmf/fmt.d,
+    thanks Jörg-Volker Peetz (Closes: #584950)
+
+2010-08-10
+
+  * [bin] revert the set -e change since we are in freeze, change the
+    texconfig patch to only remove the text and depend on debianized fmtutil.
+
+2010-08-06
+
+  * [bin] adapt the texconfig formats and texconfig hyphen warning text to
+    Debian reality (Closes: #588731)
+
+2010-08-05
+
+  * [bin] add perl, texlive-common to the list of dependencies
+  * [bin] set -e in updmap, mktexlsr, fmtutil (Closes: #586549)
+
+2010-07-01
+
+  * [extra] add the forgotten epoch for musixtex dependency (Closes: #587746)
+
 release texlive-extra 2009-9 unstable
 
 2010-06-29
diff -u texlive-extra-2009/debian/common.functions.postinst texlive-extra-2009/debian/common.functions.postinst
--- texlive-extra-2009/debian/common.functions.postinst
+++ texlive-extra-2009/debian/common.functions.postinst
@@ -1,5 +1,5 @@
 # common.functions.postinst start
-# $Id: common.functions.postinst 3943 2009-05-22 12:11:09Z preining $
+# $Id: common.functions.postinst 3031 2007-08-13 05:20:40Z preining $
 handle_config_file_postinst() 
 {
     # this function handles two things: It moves conffiles to their
diff -u texlive-extra-2009/debian/convert-info-files-to-unix.sh texlive-extra-2009/debian/convert-info-files-to-unix.sh
--- texlive-extra-2009/debian/convert-info-files-to-unix.sh
+++ texlive-extra-2009/debian/convert-info-files-to-unix.sh
@@ -4,7 +4,7 @@
 #
 # info files in texlive are with DOS lineendings. Fix this here
 #
-# $Id: convert-info-files-to-unix.sh 3943 2009-05-22 12:11:09Z preining $
+# $Id: convert-info-files-to-unix.sh 2583 2007-03-15 20:12:56Z frank $
 # Norbert Preining, 2005
 # GPL
 set -e
diff -u texlive-extra-2009/debian/tpm2deb.cfg texlive-extra-2009/debian/tpm2deb.cfg
--- texlive-extra-2009/debian/tpm2deb.cfg
+++ texlive-extra-2009/debian/tpm2deb.cfg
@@ -2,7 +2,7 @@
 # tpm2deb.cfg
 # (c) 2005-2009 Norbert Preining
 #
-# $Id: tpm2deb.cfg 4645 2010-06-29 04:18:43Z preining $
+# $Id: tpm2deb.cfg 4663 2010-08-11 04:24:49Z preining $
 #
 # describe relations between texlive and other debian packages, but als
 # which packages and files should be blacklisted
@@ -511,7 +511,7 @@
 blacklist;tpm;musixflx;*
 blacklist;tpm;musixlyr;*
 # musixtex package since 0.114-2 includes musixlyr and musxtex-slurps
-depends;texlive-music;musixtex (>= 0.114-2)
+depends;texlive-music;musixtex (>= 1:0.114-2)
 #
 # lcdf-typetools
 blacklist;tpm;bin-lcdftypetools;*
@@ -610,6 +610,7 @@
 # basic stuff
 replaces;texlive-latex-base;texlive-latex-recommended (<< 2008)
 conflicts;texlive-base;texlive-base-bin (<< 2008)
+conflicts;texlive-base;texlive-base-bin-doc
 replaces;texlive-base;texlive-base-bin-doc
 conflicts;texlive-latex-recommended;texlive-base-bin (<< 2008)
 conflicts;texlive-common;texlive-base-bin (<< 2008)
diff -u texlive-extra-2009/debian/common.functions.postrm texlive-extra-2009/debian/common.functions.postrm
--- texlive-extra-2009/debian/common.functions.postrm
+++ texlive-extra-2009/debian/common.functions.postrm
@@ -1,5 +1,5 @@
 # common.functions.postrm start
-# $Id: common.functions.postrm 3943 2009-05-22 12:11:09Z preining $
+# $Id: common.functions.postrm 2876 2007-05-22 08:12:07Z frank $
 check_move_back () 
 {
   orig="$1"
diff -u texlive-extra-2009/debian/merge-dist-tree texlive-extra-2009/debian/merge-dist-tree
--- texlive-extra-2009/debian/merge-dist-tree
+++ texlive-extra-2009/debian/merge-dist-tree
@@ -1,6 +1,6 @@
 #
 # merge-dist-tree
-# $Id: merge-dist-tree 3943 2009-05-22 12:11:09Z preining $
+# $Id: merge-dist-tree 2583 2007-03-15 20:12:56Z frank $
 # (c) 2006 Norbert Preining
 #
 # merge tree $1 into destination $2
diff -u texlive-extra-2009/debian/common.functions.preinst texlive-extra-2009/debian/common.functions.preinst
--- texlive-extra-2009/debian/common.functions.preinst
+++ texlive-extra-2009/debian/common.functions.preinst
@@ -1,5 +1,5 @@
 # common.functions.preinst start
-# $Id: common.functions.preinst 3943 2009-05-22 12:11:09Z preining $
+# $Id: common.functions.preinst 3435 2008-06-23 19:54:16Z frank $
 
 dpkg_md5sum()
 {
diff -u texlive-extra-2009/debian/copyright texlive-extra-2009/debian/copyright
--- texlive-extra-2009/debian/copyright
+++ texlive-extra-2009/debian/copyright
@@ -793 +793 @@
-$Id: copyright 3943 2009-05-22 12:11:09Z preining $
+$Id: copyright 3478 2008-07-22 11:07:21Z preining $
diff -u texlive-extra-2009/debian/generate-license-file texlive-extra-2009/debian/generate-license-file
--- texlive-extra-2009/debian/generate-license-file
+++ texlive-extra-2009/debian/generate-license-file
@@ -1,6 +1,6 @@
 #
 # generate-license-file
-# $Id: generate-license-file 3943 2009-05-22 12:11:09Z preining $
+# $Id: generate-license-file 2943 2007-06-05 15:41:04Z preining $
 # (c) 2006 Norbert Preining
 #
 # generate a license file from the information in the tpm and the
diff -u texlive-extra-2009/debian/fix-bin-dangling-links.sh texlive-extra-2009/debian/fix-bin-dangling-links.sh
--- texlive-extra-2009/debian/fix-bin-dangling-links.sh
+++ texlive-extra-2009/debian/fix-bin-dangling-links.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Id: fix-bin-dangling-links.sh 3943 2009-05-22 12:11:09Z preining $
+# $Id: fix-bin-dangling-links.sh 3681 2008-12-18 21:36:58Z preining $
 #
 # TeX Live 2008 ships many "binaries" as symlinks to ../../texmf-*/...
 # which we have to fix here