[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, experimental, updated. debian/1.6.0-13-46-ge074af2
Ralf Treinen
treinen at free.fr
Mon Mar 1 22:28:01 UTC 2010
The following commit has been merged in the experimental branch:
commit 93f9b5976b24226fac7f2c22f4ce4b1f0d16c096
Author: Ralf Treinen <treinen at free.fr>
Date: Mon Mar 1 23:13:50 2010 +0100
move many more patches out of the way
diff --git a/debian/changelog b/debian/changelog
index 9acf250..4f34006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-advi (1.8-1) UNRELEASED; urgency=low
+advi (1.8-1) experimental; urgency=low
[ Ralf Treinen ]
* New upstream release
@@ -18,15 +18,27 @@ advi (1.8-1) UNRELEASED; urgency=low
these directories from advi-1.6 into debian/examples-source. This
directory has the relevant debian patches from 1.6.0 applied.
* Old patches:
- - 0001-Pull-CVS-HEAD-as-of-20060103: now integrated in upstream
- - 0002-Makefile-.depend-workaround-for-buggy-make-behavior: no longer
- relevant
- - 0003-Don-t-call-advi-on-example-build-generation: concerns only
- examples, moved into examples-source/patches/
- 0004-Japanese-fonts: jpfonts.config is no longer in upstream, put it
into debian/. Patch renamed to japanese-fonts
- 0005-Cache-dir.patch: renamed to cache-dir-tilde-expansion
-
+ - The following patches are no longe relevant, and have been removed:
+ 0001-Pull-CVS-HEAD-as-of-20060103 (now integrated in upstream)
+ 0002-Makefile-.depend-workaround-for-buggy-make-behavior
+ 0013-Doc-build.patch (doc recompiles smoothly now)
+ - The following patches concern only examples. or test/. They are already
+ applied to the copy which now in debian/examples-source. These patches
+ are therefore just stored in debian/examples-source/patches:
+ 0003-Don-t-call-advi-on-example-build-generation
+ 0007-Fix-examples-includes
+ 0008-Fix-mon_seminar
+ 0009-Fix-test-includes.patch
+ 0010-Neutralize-texinputs.patch
+ 0011-No-bubble.patch
+ 0012-Set-test-cache-dir.patch
+ 0014-xanim-xanimate.patch
+ 0016-example-makefiles-texinputs.patch
+ 0017-Don-t-compile-tests-which-fail-with-texlive.patch
+
[ Stefano Zacchiroli ]
* fix vcs-svn field to point just above the debian/ dir
diff --git a/debian/patches/0007-Fix-examples-includes.patch b/debian/examples-source/patches/0007-Fix-examples-includes.patch
similarity index 100%
rename from debian/patches/0007-Fix-examples-includes.patch
rename to debian/examples-source/patches/0007-Fix-examples-includes.patch
diff --git a/debian/patches/0008-Fix-mon_seminar.patch b/debian/examples-source/patches/0008-Fix-mon_seminar.patch
similarity index 100%
rename from debian/patches/0008-Fix-mon_seminar.patch
rename to debian/examples-source/patches/0008-Fix-mon_seminar.patch
diff --git a/debian/patches/0009-Fix-test-includes.patch b/debian/examples-source/patches/0009-Fix-test-includes.patch
similarity index 100%
rename from debian/patches/0009-Fix-test-includes.patch
rename to debian/examples-source/patches/0009-Fix-test-includes.patch
diff --git a/debian/patches/0010-Neutralize-texinputs.patch b/debian/examples-source/patches/0010-Neutralize-texinputs.patch
similarity index 100%
rename from debian/patches/0010-Neutralize-texinputs.patch
rename to debian/examples-source/patches/0010-Neutralize-texinputs.patch
diff --git a/debian/patches/0011-No-bubble.patch b/debian/examples-source/patches/0011-No-bubble.patch
similarity index 100%
rename from debian/patches/0011-No-bubble.patch
rename to debian/examples-source/patches/0011-No-bubble.patch
diff --git a/debian/patches/0012-Set-test-cache-dir.patch b/debian/examples-source/patches/0012-Set-test-cache-dir.patch
similarity index 100%
rename from debian/patches/0012-Set-test-cache-dir.patch
rename to debian/examples-source/patches/0012-Set-test-cache-dir.patch
diff --git a/debian/patches/0014-xanim-xanimate.patch b/debian/examples-source/patches/0014-xanim-xanimate.patch
similarity index 100%
rename from debian/patches/0014-xanim-xanimate.patch
rename to debian/examples-source/patches/0014-xanim-xanimate.patch
diff --git a/debian/patches/0016-example-makefiles-texinputs.patch b/debian/examples-source/patches/0016-example-makefiles-texinputs.patch
similarity index 100%
rename from debian/patches/0016-example-makefiles-texinputs.patch
rename to debian/examples-source/patches/0016-example-makefiles-texinputs.patch
diff --git a/debian/patches/0017-Don-t-compile-tests-which-fail-with-texlive.patch b/debian/examples-source/patches/0017-Don-t-compile-tests-which-fail-with-texlive.patch
similarity index 100%
rename from debian/patches/0017-Don-t-compile-tests-which-fail-with-texlive.patch
rename to debian/examples-source/patches/0017-Don-t-compile-tests-which-fail-with-texlive.patch
diff --git a/debian/patches/0013-Doc-build.patch b/debian/patches/0013-Doc-build.patch
deleted file mode 100644
index 1bd6b8a..0000000
--- a/debian/patches/0013-Doc-build.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From 9b90d240c63247152f85c3f3c13bbd65e8a5e386 Mon Sep 17 00:00:00 2001
-From: Helge Kreutzmann <kreutzm at itp.uni-hannover.de>
-Date: Fri, 24 Apr 2009 00:19:55 +0200
-Subject: [PATCH] Doc build
-
-The HTML files cannot be build (not HTMLC available)
-Solution: Do not build/ship HTML files
-The man page cannot be build (no .m file in source)
-Solution: Do not rebuild man page, use prebuild one
-but this does not work right now :-((
----
- doc/MakeMan | 4 ++--
- doc/Makefile | 19 ++++++++++---------
- doc/manual.tex | 8 ++++----
- doc/scratch_draw_splash.tex | 4 ++--
- doc/scratch_write_splash.tex | 4 ++--
- doc/splash.tex | 4 ++--
- 6 files changed, 22 insertions(+), 21 deletions(-)
-
-diff --git a/doc/MakeMan b/doc/MakeMan
-index 05325b1..23cd4a7 100644
---- a/doc/MakeMan
-+++ b/doc/MakeMan
-@@ -37,7 +37,7 @@ clean:
- $(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 --git a/doc/Makefile b/doc/Makefile
-index b0608ad..09cdb9d 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -21,22 +21,22 @@ include ../Makefile.config
-
- # 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:$$TEXINPUTS
-
- LATEX=$(SETTEXINPUTS) latex
- DVIPS=TEXPSHEADERS=.:../tex: dvips
- 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 \
-- advi_remote.dvi advi_remote.html \
-- advi.1
-+ advi_remote.dvi
-
- clean::
- $(RM) manual.advi manual.html
-@@ -54,7 +54,7 @@ web:
- $(MAKE) -f MakeMan all
-
- advi.1: ../doc_src/advi.man
-- $(MAKE) -f MakeMan all
-+ $(MAKE) -f MakeMan manpages
-
-
- manual.dvi: ../tex/advi.sty manual.sty splash_contents.tex \
-@@ -95,7 +95,7 @@ endif
- 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 @@ endif
- 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 --git a/doc/manual.tex b/doc/manual.tex
-index 098d40d..ef237df 100644
---- a/doc/manual.tex
-+++ b/doc/manual.tex
-@@ -55,7 +55,7 @@ Reference manual\\
- \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 @@ unset).
- \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 --git a/doc/scratch_draw_splash.tex b/doc/scratch_draw_splash.tex
-index 5e9406a..39cdee9 100644
---- a/doc/scratch_draw_splash.tex
-+++ b/doc/scratch_draw_splash.tex
-@@ -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 --git a/doc/scratch_write_splash.tex b/doc/scratch_write_splash.tex
-index 2795bc1..be69ed7 100644
---- a/doc/scratch_write_splash.tex
-+++ b/doc/scratch_write_splash.tex
-@@ -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 --git a/doc/splash.tex b/doc/splash.tex
-index f121514..093101f 100644
---- a/doc/splash.tex
-+++ b/doc/splash.tex
-@@ -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}
---
-1.6.2.1
-
--
advi packaging
More information about the Pkg-ocaml-maint-commits
mailing list