diff -Nur advi-1.6.0.old/debian/advi-doc.examples advi-1.6.0/debian/advi-doc.examples
--- advi-1.6.0.old/debian/advi-doc.examples	1970-01-01 01:00:00.000000000 +0100
+++ advi-1.6.0/debian/advi-doc.examples	2006-11-16 17:42:48.000000000 +0100
@@ -0,0 +1,3 @@
+examples
+test
+Makefile.config
diff -Nur advi-1.6.0.old/debian/advi-doc.README.Debian advi-1.6.0/debian/advi-doc.README.Debian
--- advi-1.6.0.old/debian/advi-doc.README.Debian	1970-01-01 01:00:00.000000000 +0100
+++ advi-1.6.0/debian/advi-doc.README.Debian	2006-11-16 17:42:48.000000000 +0100
@@ -0,0 +1,17 @@
+advi-examples for Debian
+------------------------
+
+  * The demos are slightly modified from upstream to be fully playable
+    as shipped by Debian
+
+  * The cross-dvi-links as well as the links to the source files do not work
+    currently as the examples shipped by Debian are compressed and the 
+    cross-link feature expects uncompressed dvi-files (see, e.g., demo.dvi.gz
+    in the examples/test directory).
+
+  * The video examples does not work. FIXME. because the video file
+    is not contained in the upstream tar ball and mplayer is not
+    contained in Debian.
+
+ -- Helge Kreutzmann <kreutzm@itp.uni-hannover.de>, Sun, 06 Jan 2005 15:14:28 +0100
+
diff -Nur advi-1.6.0.old/debian/advi-examples.examples advi-1.6.0/debian/advi-examples.examples
--- advi-1.6.0.old/debian/advi-examples.examples	2006-11-16 15:19:47.000000000 +0100
+++ advi-1.6.0/debian/advi-examples.examples	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-examples
-test
-Makefile.config
diff -Nur advi-1.6.0.old/debian/advi-examples.README.Debian advi-1.6.0/debian/advi-examples.README.Debian
--- advi-1.6.0.old/debian/advi-examples.README.Debian	2006-11-16 15:19:47.000000000 +0100
+++ advi-1.6.0/debian/advi-examples.README.Debian	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-advi-examples for Debian
-------------------------
-
-  * The demos are slightly modified from upstream to be fully playable
-    as shipped by Debian
-
-  * The cross-dvi-links as well as the links to the source files do not work
-    currently as the examples shipped by Debian are compressed and the 
-    cross-link feature expects uncompressed dvi-files (see, e.g., demo.dvi.gz
-    in the examples/test directory).
-
-  * The video examples does not work. FIXME. because the video file
-    is not contained in the upstream tar ball and mplayer is not
-    contained in Debian.
-
- -- Helge Kreutzmann <kreutzm@itp.uni-hannover.de>, Sun, 06 Jan 2005 15:14:28 +0100
-
diff -Nur advi-1.6.0.old/debian/changelog advi-1.6.0/debian/changelog
--- advi-1.6.0.old/debian/changelog	2006-11-16 15:19:47.000000000 +0100
+++ advi-1.6.0/debian/changelog	2006-11-16 17:45:10.000000000 +0100
@@ -1,3 +1,22 @@
+advi (1.6.0-10.1) unstable; urgency=low
+
+  * NMU to fix two RC bugs and one important bug
+  * [patches/doc_build.dpatch] Make the documentation build again (closes:
+    #398695)
+    - Call imagen explicitly, and use \PassOptionsToPackage instead of
+      \def\driver
+    - In TeX input files, do not specify the extension (.eps) for included
+      images.  This is not needed, and since dvipdfm cannot include eps
+      files, it failed.
+    - Set TEXINPUTS for dvipdfm, too
+  * [patches/build.dpatch,links] Fix configure script to allow for multiple
+    TEXMF trees.  TeX input files are installed in TEXMFMAIN, and no link
+    will be created (closes: #398922)
+  * [control,rules,advi-examples.*] Rename advi-examples to advi-doc, and
+    let the new package replace the old one (closes: #398920)
+
+ -- Frank KÃ¼ster <frank@debian.org>  Thu, 16 Nov 2006 17:11:12 +0100
+
 advi (1.6.0-10) unstable; urgency=low
 
   * Remove work-around against debhelper bug: use -X.aux instead of -X\\.aux,
diff -Nur advi-1.6.0.old/debian/control advi-1.6.0/debian/control
--- advi-1.6.0.old/debian/control	2006-11-16 15:19:47.000000000 +0100
+++ advi-1.6.0/debian/control	2006-11-16 17:42:48.000000000 +0100
@@ -24,15 +24,17 @@
  security problems when viewing untrusted DVI files. Make sure to read the
  README.Debian for more information.
 
-Package: advi-examples
+Package: advi-doc
 Architecture: all
 Depends: tetex-bin, gs, advi, imagemagick
-Conflicts: advi (<< 1.6.0-4)
+Conflicts: advi (<< 1.6.0-4), advi-examples
+Replaces: advi-examples
+Provides: advi-examples
 Suggests: ttf-kochi-gothic, ttf-kochi-mincho, ocaml-base-nox, mpg321, tk8.4, xbase-clients, xterm
-Description: example presentations for Active-DVI (advi)
+Description: documentation and example presentations for Active-DVI (advi)
  Active-DVI is a DVI previewer and presenter written in Objective Caml
  with some eye candy effects for presentation, support for interactive
  demonstrations, and embedding of arbitrary applications within the
  presentation (hence the Active adjective of the presenter :).
  .
- This package contains example presentations for Active-DVI. 
+ This package contains the user manual and example presentations for Active-DVI. 
diff -Nur advi-1.6.0.old/debian/links advi-1.6.0/debian/links
--- advi-1.6.0.old/debian/links	2006-11-16 15:19:47.000000000 +0100
+++ advi-1.6.0/debian/links	2006-11-16 17:30:50.000000000 +0100
@@ -1,3 +1,2 @@
-usr/lib/advi usr/share/texmf/tex/advi
 usr/share/man/man1/advi.1.gz usr/share/man/man1/advi.bin.1.gz
 usr/share/man/man1/advi.1.gz usr/share/man/man1/zadvi.1.gz
diff -Nur advi-1.6.0.old/debian/patches/build.dpatch advi-1.6.0/debian/patches/build.dpatch
--- advi-1.6.0.old/debian/patches/build.dpatch	2006-11-16 15:19:47.000000000 +0100
+++ advi-1.6.0/debian/patches/build.dpatch	2006-11-16 17:37:16.000000000 +0100
@@ -19,9 +19,9 @@
 
 exit 0
 @DPATCH@
-diff -urN advi-1.6.0/config.ml.in advi-1.6.0-debian/config.ml.in
---- advi-1.6.0/config.ml.in	2004-08-09 22:52:52.000000000 +0200
-+++ advi-1.6.0-debian/config.ml.in	2004-10-21 11:06:04.290421296 +0200
+diff -urNad advi-1.6.0/config.ml.in /tmp/dpep.e68kkb/advi-1.6.0/config.ml.in
+--- advi-1.6.0/config.ml.in	2006-11-16 17:29:19.000000000 +0100
++++ /tmp/dpep.e68kkb/advi-1.6.0/config.ml.in	2006-11-16 17:29:19.000000000 +0100
 @@ -44,6 +44,7 @@
  
  (* Location of splash.dvi and test/caml.eps *)
@@ -30,9 +30,9 @@
  let splash_screen = Filename.concat advi_loc "splash.dvi";;
  let scratch_draw_splash_screen =
    Filename.concat advi_loc "scratch_draw_splash.dvi";;
-diff -urN advi-1.6.0/configure advi-1.6.0-debian/configure
---- advi-1.6.0/configure	2004-10-02 23:10:57.000000000 +0200
-+++ advi-1.6.0-debian/configure	2004-10-21 11:08:13.954709328 +0200
+diff -urNad advi-1.6.0/configure /tmp/dpep.e68kkb/advi-1.6.0/configure
+--- advi-1.6.0/configure	2006-11-16 17:29:19.000000000 +0100
++++ /tmp/dpep.e68kkb/advi-1.6.0/configure	2006-11-16 17:29:19.000000000 +0100
 @@ -309,7 +309,7 @@
  # include <unistd.h>
  #endif"
@@ -42,7 +42,7 @@
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -4750,6 +4750,7 @@
+@@ -4733,6 +4733,7 @@
  fi
  
  ADVI_LOC=`pwd`
@@ -50,26 +50,15 @@
  
  
  
-@@ -4782,11 +4783,13 @@
- mylibdir=$libdir
- test "x$libdir" = 'x${exec_prefix}/lib' && mylibdir="$myexec_prefix/lib"
- 
--if test -d $TEXMFMAIN/tex/latex; then
--  ADVI_LOC=$TEXMFMAIN/tex/latex/advi
--else
--  ADVI_LOC=$mylibdir/advi
--fi
-+#if test -d $TEXMFMAIN/tex/latex; then
-+#  ADVI_LOC=$TEXMFMAIN/tex/latex/advi
-+#else
-+#  ADVI_LOC=$mylibdir/advi
-+#fi
-+ADVI_LOC=${mylibdir}/advi
+@@ -4771,6 +4772,7 @@
+ else
+   ADVI_LOC=$mylibdir/advi
+ fi
 +ETC_ADVI_LOC=/etc/advi
  
  
  
-@@ -5464,6 +5467,7 @@
+@@ -5448,6 +5450,7 @@
  s,@XINERAMA_FLAG@,$XINERAMA_FLAG,;t t
  s,@HAVE_HEVEA@,$HAVE_HEVEA,;t t
  s,@ADVI_LOC@,$ADVI_LOC,;t t
@@ -77,7 +66,7 @@
  s,@WITH_X@,$WITH_X,;t t
  s,@LIBOBJS@,$LIBOBJS,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-@@ -5740,6 +5744,7 @@
+@@ -5725,6 +5728,7 @@
  echo "LablTk:      $HAVE_LABLTK"
  echo "GS:          $GS_UPTO_DATE version $GS_VERSION at $PATH_GS"
  echo "Resources:   $ADVI_LOC/"
@@ -85,9 +74,21 @@
  echo "Hevea:       $PATH_HEVEA"
  echo "Xinerama:    $HAVE_XINERAMA"
  echo "------------------------------------------------------------------------"
-diff -urN advi-1.6.0/Makefile advi-1.6.0-debian/Makefile
---- advi-1.6.0/Makefile	2004-10-02 23:35:09.000000000 +0200
-+++ advi-1.6.0-debian/Makefile	2004-10-21 11:12:54.977987296 +0200
+diff -urNad advi-1.6.0/configure.in /tmp/dpep.e68kkb/advi-1.6.0/configure.in
+--- advi-1.6.0/configure.in	2006-11-16 17:29:19.000000000 +0100
++++ /tmp/dpep.e68kkb/advi-1.6.0/configure.in	2006-11-16 17:29:19.000000000 +0100
+@@ -256,7 +256,7 @@
+ mylibdir=$libdir
+ test "x$libdir" = 'x${exec_prefix}/lib' && mylibdir="$myexec_prefix/lib"
+ 
+-if test -d $TEXMFMAIN/tex/latex; then
++if test -n $TEXMFMAIN; then
+   ADVI_LOC=$TEXMFMAIN/tex/latex/advi
+ else 
+   ADVI_LOC=$mylibdir/advi
+diff -urNad advi-1.6.0/Makefile /tmp/dpep.e68kkb/advi-1.6.0/Makefile
+--- advi-1.6.0/Makefile	2006-11-16 17:29:19.000000000 +0100
++++ /tmp/dpep.e68kkb/advi-1.6.0/Makefile	2006-11-16 17:29:19.000000000 +0100
 @@ -58,8 +58,10 @@
  BYTOPTIONS = -warn-error A -g
  BINOPTIONS = -warn-error A -inline 10000
@@ -150,9 +151,9 @@
  
  MLFILES = $(addsuffix .ml, $(MODULES))
  
-diff -urN advi-1.6.0/Makefile.config.in advi-1.6.0-debian/Makefile.config.in
---- advi-1.6.0/Makefile.config.in	2004-10-02 21:21:01.000000000 +0200
-+++ advi-1.6.0-debian/Makefile.config.in	2004-10-21 11:14:20.802939920 +0200
+diff -urNad advi-1.6.0/Makefile.config.in /tmp/dpep.e68kkb/advi-1.6.0/Makefile.config.in
+--- advi-1.6.0/Makefile.config.in	2006-11-16 17:29:18.000000000 +0100
++++ /tmp/dpep.e68kkb/advi-1.6.0/Makefile.config.in	2006-11-16 17:29:19.000000000 +0100
 @@ -44,6 +44,7 @@
  includedir=@includedir@
  
diff -Nur advi-1.6.0.old/debian/patches/doc_build.dpatch advi-1.6.0/debian/patches/doc_build.dpatch
--- advi-1.6.0.old/debian/patches/doc_build.dpatch	2006-11-16 15:19:47.000000000 +0100
+++ advi-1.6.0/debian/patches/doc_build.dpatch	2006-11-16 18:00:18.000000000 +0100
@@ -22,33 +22,28 @@
 
 exit 0
 @DPATCH@
-diff -urNad advi-1.6.0~/doc/MakeMan advi-1.6.0/doc/MakeMan
---- advi-1.6.0~/doc/MakeMan	2004-10-02 21:35:39.000000000 +0000
-+++ advi-1.6.0/doc/MakeMan	2006-01-24 22:15:14.000000000 +0000
-@@ -37,7 +37,7 @@
- 	$(RM) $(FILES)
- 
- manpages:
--	for i in $(SRC)/*.m; do \
--	    $(CP) $$i ./`basename $$i .m`.$(MANEXT); \
-+	for i in $(SRC)/*.man; do \
-+	    $(CP) $$i ./`basename $$i .man`.$(MANEXT); \
- 	done
- 
-diff -urNad advi-1.6.0~/doc/Makefile advi-1.6.0/doc/Makefile
---- advi-1.6.0~/doc/Makefile	2006-01-24 22:14:56.000000000 +0000
-+++ advi-1.6.0/doc/Makefile	2006-01-24 22:14:57.000000000 +0000
-@@ -21,7 +21,8 @@
+diff -urNad advi-1.6.0/doc/Makefile /tmp/dpep.rkkLMK/advi-1.6.0/doc/Makefile
+--- advi-1.6.0/doc/Makefile	2006-11-16 17:58:56.000000000 +0100
++++ /tmp/dpep.rkkLMK/advi-1.6.0/doc/Makefile	2006-11-16 17:59:49.000000000 +0100
+@@ -21,22 +21,22 @@
  
  # See also file MakeHTML to recompile HTML files for the Web site.
  
 -SETTEXINPUTS=TEXINPUTS=.:../tex:/usr/lib/hevea/:/usr/local/lib/hevea/:/usr/local/share/texmf/tex//:$$TEXINPUTS
 +# SETTEXINPUTS=TEXINPUTS=.:../tex:/usr/lib/hevea/:/usr/local/lib/hevea/:/usr/local/share/texmf/tex//:$$TEXINPUTS
-+SETTEXINPUTS=TEXINPUTS=.:../tex:/usr/lib/hevea/:
++SETTEXINPUTS=TEXINPUTS=.:../tex:$$TEXINPUTS
  
  LATEX=$(SETTEXINPUTS) latex
  DVIPS=TEXPSHEADERS=.:../tex: dvips
-@@ -35,8 +36,7 @@
+ HEVEA=$(PATH_HEVEA) -entities -I ../tex
+ IMAGEN=$(SETTEXINPUTS) imagen
+-PDFIMAGEN=pdfimagen
+-DVIPDFM=dvipdfm
++#PDFIMAGEN=pdfimagen
++DVIPDFM=$(SETTEXINPUTS) dvipdfm
+ 
+ all: manual.dvi manual.ps manual.pdf manual.html \
+     splash.dvi splash.ps \
      scratch_write_splash.dvi scratch_write_splash.ps \
      scratch_draw_splash.dvi scratch_draw_splash.ps \
      mathmode.dvi \
@@ -67,3 +62,132 @@
  
  
  manual.dvi: ../tex/advi.sty manual.sty splash_contents.tex \
+@@ -95,7 +95,7 @@
+ 	if [ -e $*.dvi ]; then \
+ 	  $(MV) $*.dvi $*.advi; \
+ 	fi
+-	$(LATEX) '\def\driver{dvipdfm}\input' $<
++	$(LATEX) '\PassOptionsToPackage{dvipdfm}{graphicx}\input' $<
+ 	- $(DVIPDFM) -o $@ $*.dvi
+ 	if [ -e $*.advi ]; then \
+ 	  $(MV) $*.advi $*.dvi; \
+@@ -105,8 +105,9 @@
+ 	cp -p $< $*.dvi
+ 
+ .html.ima:
+-	if [ -f $*.image.tex ]; then $(PDFIMAGEN) $*; fi
++	if [ -f $*.image.tex ]; then $(IMAGEN) $*; fi
+ 	touch $*.ima
+ 
+ .tex.html:
+-	$(HEVEA) -fix macros.hva -o $*.html $*.tex
++	$(HEVEA) macros.hva -o $*.html $*.tex
++	$(IMAGEN) $*
+diff -urNad advi-1.6.0/doc/MakeMan /tmp/dpep.rkkLMK/advi-1.6.0/doc/MakeMan
+--- advi-1.6.0/doc/MakeMan	2006-11-16 17:58:56.000000000 +0100
++++ /tmp/dpep.rkkLMK/advi-1.6.0/doc/MakeMan	2006-11-16 17:58:56.000000000 +0100
+@@ -37,7 +37,7 @@
+ 	$(RM) $(FILES)
+ 
+ manpages:
+-	for i in $(SRC)/*.m; do \
+-	    $(CP) $$i ./`basename $$i .m`.$(MANEXT); \
++	for i in $(SRC)/*.man; do \
++	    $(CP) $$i ./`basename $$i .man`.$(MANEXT); \
+ 	done
+ 
+diff -urNad advi-1.6.0/doc/manual.tex /tmp/dpep.rkkLMK/advi-1.6.0/doc/manual.tex
+--- advi-1.6.0/doc/manual.tex	2006-11-16 17:58:56.000000000 +0100
++++ /tmp/dpep.rkkLMK/advi-1.6.0/doc/manual.tex	2006-11-16 17:58:56.000000000 +0100
+@@ -55,7 +55,7 @@
+ \advance \tmpdim by 4em
+ \begin{tabular}{c}
+ \box0 \\
+-\includegraphics[width=\the\tmpdim]{bar.eps}\\
++\includegraphics[width=\the\tmpdim]{bar}\\
+ Reference manual\\
+ {\small Version {\adviversion}}
+ \end{tabular}
+@@ -789,16 +789,16 @@
+ \begin{verbatim}
+ {\setblend{burn}
+   {\setalpha{0.5}
+-    {\includegraphics[width = 0.7\textwidth]{bar.eps}}}}
++    {\includegraphics[width = 0.7\textwidth]{bar}}}}
+ \end{verbatim}
+ 
+ {\setblend{difference}
+   {\setalpha{0.5}
+-    {\includegraphics[width = 0.7\textwidth]{bar.eps}}}}
++    {\includegraphics[width = 0.7\textwidth]{bar}}}}
+ 
+ {\setblend{normal}
+   {\setalpha{0.5}
+-    {\includegraphics[width = 0.7\textwidth]{bar.eps}}}}
++    {\includegraphics[width = 0.7\textwidth]{bar}}}}
+ 
+ \subsection{Colors}
+ 
+diff -urNad advi-1.6.0/doc/scratch_draw_splash.tex /tmp/dpep.rkkLMK/advi-1.6.0/doc/scratch_draw_splash.tex
+--- advi-1.6.0/doc/scratch_draw_splash.tex	2006-11-16 17:58:56.000000000 +0100
++++ /tmp/dpep.rkkLMK/advi-1.6.0/doc/scratch_draw_splash.tex	2006-11-16 17:58:56.000000000 +0100
+@@ -31,7 +31,7 @@
+ 
+ \def\adviheader{\noindent
+ {\bf{\Large {\adviname}} (version \adviversion)}\\
+-\includegraphics[width=\textwidth]{bar.eps}}
++\includegraphics[width=\textwidth]{bar}}
+ 
+ \let \Newpage \newpage
+ \def \newpage {\Newpage \advifooter\adviheader}
+@@ -51,7 +51,7 @@
+ The presentation tool of choice for discriminating hackers.
+ See \texttt{http://pauillac.inria.fr/advi/}
+ &
+-\raisebox{-30pt}{\includegraphics[width=2cm]{advilogo.eps}}
++\raisebox{-30pt}{\includegraphics[width=2cm]{advilogo}}
+ \end{tabularx}
+ 
+ \subsection*{Key bindings when drawing on slides (scratching)}
+diff -urNad advi-1.6.0/doc/scratch_write_splash.tex /tmp/dpep.rkkLMK/advi-1.6.0/doc/scratch_write_splash.tex
+--- advi-1.6.0/doc/scratch_write_splash.tex	2006-11-16 17:58:56.000000000 +0100
++++ /tmp/dpep.rkkLMK/advi-1.6.0/doc/scratch_write_splash.tex	2006-11-16 17:58:56.000000000 +0100
+@@ -31,7 +31,7 @@
+ 
+ \def\adviheader{\noindent
+ {\bf{\Large {\adviname}} (version \adviversion)}\\
+-\includegraphics[width=\textwidth]{bar.eps}}
++\includegraphics[width=\textwidth]{bar}}
+ 
+ \let \Newpage \newpage
+ \def \newpage {\Newpage \advifooter\adviheader}
+@@ -51,7 +51,7 @@
+ The presentation tool of choice for discriminating hackers.
+ See \texttt{http://pauillac.inria.fr/advi/}
+ &
+-\raisebox{-30pt}{\includegraphics[width=2cm]{advilogo.eps}}
++\raisebox{-30pt}{\includegraphics[width=2cm]{advilogo}}
+ \end{tabularx}
+ 
+ \subsection*{Key bindings to write on slides (scratch writing)}
+diff -urNad advi-1.6.0/doc/splash.tex /tmp/dpep.rkkLMK/advi-1.6.0/doc/splash.tex
+--- advi-1.6.0/doc/splash.tex	2006-11-16 17:58:56.000000000 +0100
++++ /tmp/dpep.rkkLMK/advi-1.6.0/doc/splash.tex	2006-11-16 17:58:56.000000000 +0100
+@@ -29,7 +29,7 @@
+ 
+ \def\adviheader{\noindent
+ {\bf{\Large {\adviname}} (version \adviversion)}\\
+-\includegraphics[width=\textwidth]{bar.eps}}
++\includegraphics[width=\textwidth]{bar}}
+ 
+ \let \Newpage \newpage
+ \def \newpage {\Newpage \advifooter\adviheader}
+@@ -51,7 +51,7 @@
+ The presentation tool of choice for discriminating hackers.
+ See \texttt{http://pauillac.inria.fr/advi/}
+ &
+-\raisebox{-30pt}{\includegraphics[width=2cm]{advilogo.eps}}
++\raisebox{-30pt}{\includegraphics[width=2cm]{advilogo}}
+ \end{tabularx}
+ 
+ \subsection*{Usage}
diff -Nur advi-1.6.0.old/debian/rules advi-1.6.0/debian/rules
--- advi-1.6.0.old/debian/rules	2006-11-16 15:19:47.000000000 +0100
+++ advi-1.6.0/debian/rules	2006-11-16 17:53:46.000000000 +0100
@@ -5,6 +5,7 @@
 # We want to use dpatch.
 include /usr/share/dpatch/dpatch.make
 PACKAGE = advi
+docpack = advi-doc
 VERSION = 1.6.0
 
 export DH_VERBOSE=1
@@ -137,23 +138,23 @@
 	dh_testroot -i 
 	dh_installdocs -i
 	dh_installexamples -i -X.aux -X.cmi -X.cmo -X.log -X.out -X.toc
-	mkdir $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/manual
-	cd doc && cp -ivp mathmode.dvi splash.dvi scratch_write_splash.dvi scratch_draw_splash.dvi advi_remote.dvi manual.pdf $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/manual
-	mv $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/examples \
-	   $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/upstream-examples
-	rm $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/upstream-examples/seminar/a14/fig/*.png
-	rm $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/upstream-examples/seminar/a14/fig/*.gif
+	mkdir $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/manual
+	cd doc && cp -ivp mathmode.dvi splash.dvi scratch_write_splash.dvi scratch_draw_splash.dvi advi_remote.dvi manual.pdf $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/manual
+	mv $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/examples \
+	   $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/upstream-examples
+	rm $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/upstream-examples/seminar/a14/fig/*.png
+	rm $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/upstream-examples/seminar/a14/fig/*.gif
 	dh_installchangelogs -i
 	dh_compress -i -Xadviback.ppm -X.mp3 -Xtaquin -Xfumicamltrans.ppm -Xinria.ps -Xmanual.pdf
-	cd $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/upstream-examples/seminar/a14/fig/ && gunzip *.eps.gz
-	cd $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/upstream-examples/seminar/clock/ && gunzip *.eps.gz
-	cd $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/upstream-examples/slitex/skin_detection/ && gunzip *.eps.gz
-	rm $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/upstream-examples/slitex/caml/inria.ps
+	cd $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/upstream-examples/seminar/a14/fig/ && gunzip *.eps.gz
+	cd $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/upstream-examples/seminar/clock/ && gunzip *.eps.gz
+	cd $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/upstream-examples/slitex/skin_detection/ && gunzip *.eps.gz
+	rm $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/upstream-examples/slitex/caml/inria.ps
 	dh_fixperms -i
-	chmod 644 $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/upstream-examples/prosper/LL/pdfrotate.pl
-	chmod 644 $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/upstream-examples/basics/alltt.sty
-	chmod 644 $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/test/mmm.anim.gif
-	chmod 644 $(CURDIR)/debian/advi-examples/usr/share/doc/advi-examples/examples/test/music.mp3
+	chmod 644 $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/upstream-examples/prosper/LL/pdfrotate.pl
+	chmod 644 $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/upstream-examples/basics/alltt.sty
+	chmod 644 $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/test/mmm.anim.gif
+	chmod 644 $(CURDIR)/debian/$(docpack)/usr/share/doc/$(docpack)/examples/test/music.mp3
 # FIXME Also for ./examples/upstream-examples/seminar/a14/putimage ?
 	dh_installdeb -i
 	dh_gencontrol -i
diff -Nur advi-1.6.0.old/doc/advi.1 advi-1.6.0/doc/advi.1
--- advi-1.6.0.old/doc/advi.1	2004-10-02 23:37:34.000000000 +0200
+++ advi-1.6.0/doc/advi.1	1970-01-01 01:00:00.000000000 +0100
@@ -1,558 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH ADVI 1 "October 02, 2004"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-.B advi
-\-\- a DVI previewer and presenter
-.UR http://caml.inria.fr/advi/
-(http://caml.inria.fr/advi/)
-.UE
-with some eye candy effects for presentation.
-
-.SH VERSION
-Active\-DVI version 1.6
-.SH SYNOPSIS
-.B advi
-.RI [ options ] " dvifile " ...
-.SH DESCRIPTION
-The 
-.B advi
-program is a viewer for DVI files that also recognizes a new class of
-special's targeted to presentations via laptop computers: various
-visual effects can easily be incorporated to the presentation, via a
-companion advi.sty LaTeX package.
-
-.P
-.B advi
-is also a full-fledged graphical presenter that provides a wealth of
-effects via
-.B embedded
-applications. Embedded applications are arbitrary Unix programs that
-are launched on demand during the presentation; an embedded
-application may display its material on a devoted area of the slide,
-leading for example to live and/or interactive demos during the
-presentation.
-
-.SH CURRENTLY SUPPORTED FEATURES:
-
-\- Encapsulated Postscript File inclusion (using graphics package)
-
-\- Effects for presentation (pause, delay, text color change)
-
-\- Embedded applications for interactive demonstration
-
-\- Pictures visualization via gpic specials
-
-\- Display of inlined Postscript using gs
-
-\- Font antialiasing that takes background colors into account
-
-\- Page display is interrupted on user input
-
-\- Resizing the page adjusts the magnification
-
-\- Start displaying at a given page or at a given link reference
-
-\- The file is reloading on signal SIGUSR1
-
-\- Hyperlinks to other pages or slides
-
-\- Active areas (execute an action when the mouse is over)
-
-\- Background colors and images
-
-\- Alpha blending for images
-
-\- Bubbles, active anchors, annotations
-
-\- Init files to set up options
-
-\- Safety policy for embedded application
-
-\- Scratching (interactive drawing and writing on slides during presentation)
-
-\- Floating table of contents (either as hyperlinks on a regular LaTeX
-table of contents or as small images set up on a page)
-
-\- Transitions (slide animations when changing pages)
-
-\- Text movements
-
-\- Integrated ``Laser pointer'' feature to point to the slide
-
-Notice that
-.B advi
-needs the `kpsewhich' tool in order to find and
-recompile PK fonts.  (This program is part of the `kpathsea' library
-provided by many TeX distributions.)
-
-.SH OPTIONS
-Options are :
-.TP
-.B \-\-debug
-General debug
-.TP
-.B \-\-debug_pages
-Debug page motion
-.TP
-.B \-\-ignore_background
-Ignore background for antialiasing
-.TP
-.B \-\-showps
-Print a copy of Postscript sent to gs to stdout
-.TP
-.B \-\-verbose\-image\-access
-Change the cursor while loading images
-.TP
-.B \-\-version
-Print the current Active\-DVI version, sub\-version and release date
-.TP
-.B \-A
-Set Postscript antialiasing (default is unset)
-.TP
-.B \-ask
- Ask mode: launching an external application requires confirmation
-(this is the default)
-.TP
-.B \-bbox
-Show the bounding box
-.TP
-.B \-bgcolor STRING
-Set default background color (Named or RGB)
-.TP
-.B \-browser STRING
-Command to call the browser (default netscape\-communicator)
-.TP
-.B \-cache\-dir STRING
-Set the cache directory (default /tmp)
-.TP
-.B \-click\-turn
-Turn pages with mouse clicks (see the doc)
-.TP
-.B \-crop
-Crop the window to the best size (default)
-.TP
-.B \-disable\-image\-anti\-aliasing
-Disable eps inclusion anti\-aliasing
-.TP
-.B \-edit
-Start in edit mode
-.TP
-.B \-exec
-Exec mode: allow all external applications to be executed
-.TP
-.B \-fg
-Draw in the foreground
-.TP
-.B \-fgcolor STRING
-Set default foreground color (Named or RGB)
-.TP
-.B \-film\-viewer STRING
-Command to display film files (default mplayer)
-.TP
-.B \-fullwidth
-Adjust size to width
-.TP
-.B \-g GEOM
-Same as \-geometry GEOM
-.TP
-.B \-gamma FLOAT (>0)
-Gamma correction of glyphs (default 1.000000)
-.TP
-.B \-geometry GEOM
-Sets the (maximum) geometry GEOM
-.TP
-.B \-hmargin DIMEN
-Horizontal margin (default: 1cm)
-.TP
-.B \-html STRING
-Make
-.B advi
-start at html reference of name STRING
-.TP
-.B \-image\-viewer STRING
-Command to display image files (default xv)
-.TP
-.B \-inherit\-background
-Background options are inherited from previous page
-.TP
-.B \-n
-Echoes commands, but does not execute them.
-.TP
-.B \-noautoresize
-Prevents scaling from resizing the window (done if geometry is provided)
-.TP
-.B \-noautoscale
-Prevents resizing the window from scaling (done if geometry is provided)
-.TP
-.B \-nocrop
-Disable cropping
-.TP
-.B \-nogs
-Turn off display of inlined Postscript
-.TP
-.B \-nomargins
-Suppress horizontal and vertical margins
-.TP
-.B \-nopauses
-Switch pauses off
-.TP
-.B \-nowatch
-Don't display a watch when busy
-.TP
-.B \-options\-file STRING
-Load this file when parsing this option to set up options
-(to override the options of the default ~/.advirc or ~/.advi/advirc init file).
-.TP
-.B \-page INT
-Make
-.B advi
-start at page INT
-.TP
-.B \-page\-number
-Ask
-.B advi
-to write the current page number in a file (default is no)
-.TP
-.B \-page\-number\-file STRING
-Set the name of the file where
-.B advi
-could write the current page number
-(default is file 'advi\_page\_number' in the cache directory).
-.TP
-.B \-pager STRING
-Command to call the pager (default xterm \-e less)
-.TP
-.B \-passive
-Cancel all Active\-DVI effects
-.TP
-.B \-pdf\-viewer STRING
-Command to view PDF files (default xpdf)
-.TP
-.B \-ps\-viewer STRING
-Command to view PS files (default gv)
-.TP
-.B \-pstricks
-Show moveto
-.TP
-.B \-resolution REAL
-Dpi resolution of the screen (min 72.27)))
-.TP
-.B \-rv
-Reverse video is simulated by swapping the foreground and background colors.
-.TP
-.B \-safer
- Safer mode: external applications are never launched
-.TP
-.B \-scalestep REAL
-Scale step for '<' and '>' (default sqrt (sqrt (sqrt 2.0)))
-.TP
-.B \-scratch\-font STRING
-Set the font used when scratching slides (default times bold)
-.TP
-.B \-scratch\-font\-color STRING
-Set the color of the font used when scratching slides (default red)
-.TP
-.B \-scratch\-line\-color INT
-Set the color of the pen used when scratching slides (default red)
-.TP
-.B \-scratch\-line\-width INT
-Set the width of the pen used when scratching slides (default 2)
-.TP
-.B \-thumbnail\-scale INT
-Set the number of thumbname per line and column to INT
-.TP
-.B \-thumbnails
-Create thumbnails for your slides and write them into cachedir.
-.TP
-.B \-thumbnails\-size STRING
-Fix thumbnails size (default 24x32).
-.TP
-.B \-v
-Print the current Active\-DVI version
-.TP
-.B \-vmargin DIMEN
-Vertical margin (default: 1cm)
-.TP
-.B \-w STRING
-A/a enable/disable all warnings
-.TP
-.B \-watch FLOAT
-Delay before the watch cursor appears (default 0.500000s)
-.TP
-.B \-help
-Display this list of options
-.TP
-.B \-\-help
-Display this list of options
-
-.P
-Geometry GEOM is specified in pixels, using the standard format
-for specifying geometries (i.e: "WIDTHxHEIGHT[+XOFFSET+YOFFSET]").
-
-Dimensions (for options `-hmargin' and `-vmargin') are specified as
-numbers optionally followed by two letters representing units.
-When no units are given, dimensions are treated as numbers of pixels.
-Currently supported units are the standard TeX units as specified in
-the TeXbook (D. Knuth, Addison-Wesley, (C) 1986):
-
-.RS 2
-  `pt' (point), `pc' (pica), `in' (inch), `bp' (big point),
-  `cm' (centimeter), `mm' (millimeter), `dd' (didot point),
-  `cc' (cicero) and `sp' (scaled point).
-.RE
-
-Note that dimensions are specified w.r.t the original TeX document,
-and do not correspond to what is actually shown on the screen, which
-can be displayed at a different resolution than specified in the
-original TeX source.
-
-.SH KEYSTROKES
-
-Advi recognizes the following keystrokes when typed in its window.
-Some of them may optionally be preceded by a number, called ARG below,
-whose interpretation is keystroke dependant. If ARG is unset, its
-value is 1, unless specified otherwise.
-
-Advi maintains an history of previously visited pages organized as a stack.
-Additionnally, the history contains mark pages which are stronger than
-unmarked pages.
-
-.RS 2
-.TP 8
-.B ?
-Quick info and key bindings help
-
-.TP
-.B q
-Quits the program
-
-.TP
-.B ^X\-^C (Control\-X Control\-C)
-Quits the program
-
-.TP
-.B ^X\-^F (Control\-X Control\-F)
-Turn to full screen mode
-
-.TP
-.B ^F (Control\-F)
-Toggle to switch from full screen to normal mode and converse
-
-.TP
-.B ^<button> (Control + left mouse button)
-Allow moving the page into the window (useful in full screen mode)
-
-.TP
-.B return
-If ARG is non zero, push the current page on the history stack, and move
-forward Arg physical pages.
-
-.TP
-.B n
-Move ARG physical pages forward, leaving the history unchanged.
-
-.TP
-.B p
-Move ARG physical pages backward, leaving the history unchanged.
-
-.TP
-.B <tab>
-Push the current page on top of the history as a marked page, do no move.
-
-.TP
-.B <space>
-Move to the next pause if any, or do as return otherwise.
-
-.TP
-.B <backspace>
-Move ARG pages backward according to the history.
-The history stack is poped, accordingly.
-
-.TP
-.B <escape>
-Move ARG marked pages backward according to the history.
-Do nothing if the history does no contain any marked page.
-
-.TP
-.B g
-If ARG is unset move to the last page.
-If ARG is the current page do nothing.
-Otherwise, push the current page on the history as a marked page, and move to
-the physical page ARG.
-
-.TP
-.B ,
-Move to the first page.
-
-.TP
-.B .
-Move to the last page.
-
-.TP
-.B c
-Center the page in the window and resets the default resolution.
-
-.TP
-.B <
-Scale the resolution by 1/scalestep (default 1/sqrt (sqrt (sqrt 2.0)))
-
-.TP
-.B >
-Scale the resolution by  scalestep (default sqrt (sqrt (sqrt 2.0)))
-
-.TP
-.B f
-Load all the fonts used in the documents.  By default, fonts are loaded
-only when needed.
-
-.TP
-.B F
-Does the same as `f', and precomputes the glyphs of all characters used
-in the document.  This takes more time than loading the fonts, but the
-pages are drawn faster.
-
-.TP
-.B r
-Redraw the current page.
-
-.TP
-.B R
-Reload the file and redraw the current page.
-
-.TP
-.B C
-Erase the image cache
-
-.TP
-.B T
-Process thumbnails (graphical table of contents for the show)
-
-.TP
-.B t
-Display thumbnails if processed or floating table of contents, or do
-nothing
-
-.TP
-.B ^X\-l (Control\-X l)
-Toggle on or off the laser pointer
-
-.TP
-.B s
-Turn on the write scratching mode (to interactively write on the
-slide). When in scratching mode press
-.B ? 
-to get help
-
-.TP
-.B S
-Turn on the draw scratching mode (to interactively draw on the
-slide). When in scratching mode press
-.B ? 
-to get help
-
-.TP
-.B ^X\-^S (Control\-X Control\-S)
-Save an image of the current state of the slide. The default image file
-name is shot
-.B <n>
-where
-.B <n>
-is the next available integer number such that no previously saved
-slide image is overwritten. The default image format is PNG which
-is the extension of the image file.
-
-.RE
-
-A click on an hyperlink, push the current page on this history as marked
-(unless the target page is the current page) and move to the target page.
-If the target is visible, it highlights the target.
-
-Moreover, the user can drag the currently displayed page in the window
-in order to change its relative position.  (This is useful when the
-page is displayed at a resolution such that it cannot fit in the
-window.)
-
-.SH EYE CANDY MACROS
-
-Using the LaTeX style advi.sty provided with the package, you can
-embed some Active dvi specials into your TeX documents.
-.B Advi
-interprets those specials to provide some eye candy features for your
-presentation. For the casual user, the advi\-slides.sty package gives
-a truely simple way to write a show for
-.B advi
-(see in the examples directory or the documentation inside the
-advi\-slides.sty file for more information).
-
-.TP
-.B \eadviwait
-ActiveDvi stops rendering at the point of the document and wait a user key
-stroke.
-
-.TP
-.B \eadviwait{sec}
-Delay the rendering at the point of the document for sec seconds.
-
-.TP
-.B \eadvirecord[play]{this}{material}
-Define an "advi tag" named ``this'' to refer to the text enclosed in the
-following brackets. The tag can be used to change the color of the text
-later.
-
-.TP
-.B \eadvirecord{this}{material}
-Same as \eadvirecord[play]{this}{material}, but does not render the
-text at this point. You can display the text later, using the \eadviplay macro.
-
-.TP
-.B \eadviplay{this}
-Display the texts associated with the tag ``this''.
-
-.TP
-.B \eadviplay[col]{this}
-Display the texts associated with the tag ``this'', using the color ``col''.
-
-.RE
-The directory examples contains a lot of presentations.
-Please look also at test/demo*.{tex|dvi} and test/macros.{tex|dvi} for
-a rather comprehensive demonstration of Active\-DVI capabilities.
-
-.SH COPYRIGHT
-This program is distributed under the GNU LGPL.
-.SH SEE ALSO
-.BR latex (1),
-.BR kpsewhich (1),
-.BR The Active-DVI user's manual
-.UR http://caml.inria.fr/advi/manual.dvi
-and the FAQ
-.UR http://caml.inria.fr/advi/faq.html
-.SH AUTHORS
-Jun Furuse <Jun.Furuse@inria.fr>
-Pierre Weis <Pierre.Weis@inria.fr>
-Didier Remy <Didier.Remy@inria.fr> inlined Postcript, hyperlinks
-Roberto Di Cosmo <dicosmo@pauillac.inria.fr>
-Xavier Leroy <Xavier.Leroy@inria.fr> gpic specials
-Didier Le Botlan <Didier.Le_Botlan@inria.fr>
-Alan Schmitt <Alan.Schmitt@inria.fr>
-Alexandre Miquel  <Alexandre.Miquel@inria.fr>
-.P
-The original version of this manual page was written by Sven LUTHER
-<luther@debian.org>, for the Debian GNU/Linux system port of advi
-version 1.2.  This page has then been enhanced and updated for later
-versions of Active-DVI, and finally rewritten for version 1.6 by
-Pierre Weis.
