[Pkg-ocaml-maint-commits] r1272 - in trunk/packages/advi/branches/split/debian: . patches
Sven Luther
luther@costa.debian.org
Sat, 16 Apr 2005 12:56:51 +0000
Author: luther
Date: 2005-04-16 12:56:50 +0000 (Sat, 16 Apr 2005)
New Revision: 1272
Added:
trunk/packages/advi/branches/split/debian/patches/examples_no_advi_call.dpatch
Modified:
trunk/packages/advi/branches/split/debian/control
trunk/packages/advi/branches/split/debian/patches/00list
trunk/packages/advi/branches/split/debian/patches/build.dpatch
trunk/packages/advi/branches/split/debian/patches/no_bubble.dpatch
Log:
Fixed advi example builds to not call advi when building.
Modified: trunk/packages/advi/branches/split/debian/control
===================================================================
--- trunk/packages/advi/branches/split/debian/control 2005-04-16 12:27:54 UTC (rev 1271)
+++ trunk/packages/advi/branches/split/debian/control 2005-04-16 12:56:50 UTC (rev 1272)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
Uploaders: Ralf Treinen <treinen@debian.org>, Sven Luther <luther@debian.org>, Jerome Marant <jerome@debian.org>, Remi Vanicat <vanicat@debian.org>, Stefano Zacchiroli <zack@debian.org>, Sylvain Le Gall <sylvain.le-gall@polytechnique.org>, Michael K. Edwards (in Debian context) <mkedeb@sane.net>
-Build-Depends: debhelper (>> 4.0.0), tetex-bin, ocaml-3.08, libncurses5-dev, xlibs-dev, libcamlimages-ocaml-dev (>= 2.20-1), tetex-extra, zlib1g-dev, gs, dpatch, chrpath, ocaml-best-compilers, hevea
+Build-Depends: debhelper (>> 4.0.0), tetex-bin, ocaml-3.08.3, libncurses5-dev, xlibs-dev, libcamlimages-ocaml-dev (>= 2.20-1), tetex-extra, zlib1g-dev, gs, dpatch, chrpath, ocaml-best-compilers, hevea
Standards-Version: 3.6.1
Package: advi
Modified: trunk/packages/advi/branches/split/debian/patches/00list
===================================================================
--- trunk/packages/advi/branches/split/debian/patches/00list 2005-04-16 12:27:54 UTC (rev 1271)
+++ trunk/packages/advi/branches/split/debian/patches/00list 2005-04-16 12:56:50 UTC (rev 1272)
@@ -1,5 +1,6 @@
depend
build
+examples_no_advi_call.dpatch
japanese-fonts
cache_dir
bytecode
Modified: trunk/packages/advi/branches/split/debian/patches/build.dpatch
===================================================================
--- trunk/packages/advi/branches/split/debian/patches/build.dpatch 2005-04-16 12:27:54 UTC (rev 1271)
+++ trunk/packages/advi/branches/split/debian/patches/build.dpatch 2005-04-16 12:56:50 UTC (rev 1272)
@@ -161,16 +161,3 @@
HAVE_HEVEA=@HAVE_HEVEA@
PATH_HEVEA=@PATH_HEVEA@
---- advi-1.6.0/examples/basics/Makefile.orig 2005-03-16 23:45:10.462852128 +0100
-+++ advi-1.6.0/examples/basics/Makefile 2005-03-16 23:45:20.521323008 +0100
-@@ -41,8 +41,8 @@
- MLPROG=
-
- all: $(DVIFILES)
-- advi simple.dvi && \
-- advi moderate.dvi
-+ #advi simple.dvi && \
-+ #advi moderate.dvi
-
- dvi : $(DVIFILES) $(MLPROG)
-
Added: trunk/packages/advi/branches/split/debian/patches/examples_no_advi_call.dpatch
===================================================================
--- trunk/packages/advi/branches/split/debian/patches/examples_no_advi_call.dpatch 2005-04-16 12:27:54 UTC (rev 1271)
+++ trunk/packages/advi/branches/split/debian/patches/examples_no_advi_call.dpatch 2005-04-16 12:56:50 UTC (rev 1272)
@@ -0,0 +1,166 @@
+#! /bin/sh -e
+## build.dpatch by <luther@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't call advi on example build generation.
+
+if [ $# -ne 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+case "$1" in
+ -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
+ -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+@DPATCH@
+--- advi-1.6.0/examples/basics/Makefile.orig 2005-04-16 14:04:08.000000000 +0200
++++ advi-1.6.0/examples/basics/Makefile 2005-04-16 14:04:17.000000000 +0200
+@@ -41,9 +41,8 @@
+ MLPROG=
+
+ all: $(DVIFILES)
+- advi simple.dvi && \
+- advi moderate.dvi && \
+- advi bubbles.dvi
++ #advi simple.dvi && \
++ #advi moderate.dvi && \
+
+ dvi : $(DVIFILES) $(MLPROG)
+
+diff -Nur advi-1.6.0/examples/basics/cash/Makefile advi-1.6.0-noadvi/examples/basics/cash/Makefile
+--- advi-1.6.0/examples/basics/cash/Makefile 2003-10-21 21:12:26.000000000 +0200
++++ advi-1.6.0-noadvi/examples/basics/cash/Makefile 2005-04-16 14:09:50.000000000 +0200
+@@ -39,7 +39,7 @@
+ MLPROG=
+
+ all: dvi
+- advi $(DVIFILES)
++ #advi $(DVIFILES)
+
+ dvi: $(DVIFILES) $(MLPROG)
+
+diff -Nur advi-1.6.0/examples/basics/Makefile advi-1.6.0-noadvi/examples/basics/Makefile
+--- advi-1.6.0/examples/basics/Makefile 2005-04-16 14:11:42.000000000 +0200
++++ advi-1.6.0-noadvi/examples/basics/Makefile 2005-04-16 14:10:07.000000000 +0200
+@@ -50,7 +50,7 @@
+ $(DVIFILES): $(ADVIDIR)/tex/bar.eps $(ADVIDIR)/tex/advi.sty $(ADVIDIR)/tex/advi-annot.sty
+
+ .dvi.advi:
+- $(ADVI) $<
++ #$(ADVI) $<
+
+ .tex.dvi:
+ $(LATEX) $<
+diff -Nur advi-1.6.0/examples/lib/Makefile advi-1.6.0-noadvi/examples/lib/Makefile
+--- advi-1.6.0/examples/lib/Makefile 2003-09-25 11:49:16.000000000 +0200
++++ advi-1.6.0-noadvi/examples/lib/Makefile 2005-04-16 14:10:17.000000000 +0200
+@@ -10,7 +10,7 @@
+ all:: $(DVIFILES)
+
+ .dvi.advi:
+- $(ADVI) $<
++ #$(ADVI) $<
+
+ .tex.dvi:
+ $(LATEX) $*
+diff -Nur advi-1.6.0/examples/prosper/Join/Makefile advi-1.6.0-noadvi/examples/prosper/Join/Makefile
+--- advi-1.6.0/examples/prosper/Join/Makefile 2003-12-18 18:00:18.000000000 +0100
++++ advi-1.6.0-noadvi/examples/prosper/Join/Makefile 2005-04-16 14:10:25.000000000 +0200
+@@ -29,7 +29,7 @@
+ all:: show
+
+ show: join.dvi
+- $(ADVI) join.dvi
++ #$(ADVI) join.dvi
+
+ join.dvi: join.tex
+ $(LATEX) $<
+diff -Nur advi-1.6.0/examples/prosper/LL/Makefile advi-1.6.0-noadvi/examples/prosper/LL/Makefile
+--- advi-1.6.0/examples/prosper/LL/Makefile 2005-04-16 14:11:42.000000000 +0200
++++ advi-1.6.0-noadvi/examples/prosper/LL/Makefile 2005-04-16 14:10:34.000000000 +0200
+@@ -30,7 +30,7 @@
+ all: show
+
+ show: ll.dvi
+- $(ADVI) ll.dvi
++ #$(ADVI) ll.dvi
+
+ ll.dvi: ll.tex world.jpg advilogo.anim.gif
+ $(LATEX) $<
+diff -Nur advi-1.6.0/examples/seminar/a14/Makefile advi-1.6.0-noadvi/examples/seminar/a14/Makefile
+--- advi-1.6.0/examples/seminar/a14/Makefile 2003-10-21 21:12:27.000000000 +0200
++++ advi-1.6.0-noadvi/examples/seminar/a14/Makefile 2005-04-16 14:10:39.000000000 +0200
+@@ -25,7 +25,7 @@
+ N=14
+
+ all:: a${N}.dvi
+- advi a${N}.dvi
++ #advi a${N}.dvi
+
+ a${N}.dvi: mon-dvipdf.tex a${N}.tex
+ ./putimage <a${N}.tex | gpic -t > a${N}bis.tex
+diff -Nur advi-1.6.0/examples/seminar/clock/Makefile advi-1.6.0-noadvi/examples/seminar/clock/Makefile
+--- advi-1.6.0/examples/seminar/clock/Makefile 2003-11-07 17:35:24.000000000 +0100
++++ advi-1.6.0-noadvi/examples/seminar/clock/Makefile 2005-04-16 14:10:46.000000000 +0200
+@@ -29,7 +29,7 @@
+ include ../../lib/Makefile
+
+ all:: tools.dvi
+- advi tools.dvi
++ #advi tools.dvi
+
+ tools.dvi: $(EPS) tools.tex
+ $(LATEX) tools.tex
+diff -Nur advi-1.6.0/examples/slitex/advi/Makefile advi-1.6.0-noadvi/examples/slitex/advi/Makefile
+--- advi-1.6.0/examples/slitex/advi/Makefile 2003-10-21 21:12:27.000000000 +0200
++++ advi-1.6.0-noadvi/examples/slitex/advi/Makefile 2005-04-16 14:10:51.000000000 +0200
+@@ -29,7 +29,7 @@
+ .SUFFIXES: .tex
+
+ all: talk.dvi
+- advi talk.dvi
++ #advi talk.dvi
+
+ clean::
+ /bin/rm -f *.z[io] *~ *.txt *.log *.aux *.dvi talk.ps spelling
+diff -Nur advi-1.6.0/examples/slitex/caml/Makefile advi-1.6.0-noadvi/examples/slitex/caml/Makefile
+--- advi-1.6.0/examples/slitex/caml/Makefile 2003-10-21 21:49:30.000000000 +0200
++++ advi-1.6.0-noadvi/examples/slitex/caml/Makefile 2005-04-16 14:10:59.000000000 +0200
+@@ -29,7 +29,7 @@
+ .SUFFIXES: .tex
+
+ all:: talk.dvi
+- advi talk.dvi
++ #advi talk.dvi
+
+ clean::
+ /bin/rm -f *.z[io] *.aux *.dvi talk.ps *.log *~ *.txt spelling
+diff -Nur advi-1.6.0/examples/slitex/simplistic/Makefile advi-1.6.0-noadvi/examples/slitex/simplistic/Makefile
+--- advi-1.6.0/examples/slitex/simplistic/Makefile 2003-10-21 21:12:27.000000000 +0200
++++ advi-1.6.0-noadvi/examples/slitex/simplistic/Makefile 2005-04-16 14:11:05.000000000 +0200
+@@ -29,7 +29,7 @@
+ .SUFFIXES: .dvi .tex
+
+ all: talk.dvi
+- advi talk.dvi
++ #advi talk.dvi
+
+ clean:
+ /bin/rm -f *.z[io] *~ *.txt *.log *.aux *.dvi talk.ps spelling
+diff -Nur advi-1.6.0/examples/slitex/skin_detection/Makefile advi-1.6.0-noadvi/examples/slitex/skin_detection/Makefile
+--- advi-1.6.0/examples/slitex/skin_detection/Makefile 2003-10-21 21:12:28.000000000 +0200
++++ advi-1.6.0-noadvi/examples/slitex/skin_detection/Makefile 2005-04-16 14:11:17.000000000 +0200
+@@ -28,7 +28,7 @@
+ emacs skin_detection.tex
+
+ see:
+- advi skin_detection.dvi
++ #advi skin_detection.dvi
+
+ clean:
+ /bin/rm -f *~ *.txt *.log *.aux *.dvi
Property changes on: trunk/packages/advi/branches/split/debian/patches/examples_no_advi_call.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/advi/branches/split/debian/patches/no_bubble.dpatch
===================================================================
--- trunk/packages/advi/branches/split/debian/patches/no_bubble.dpatch 2005-04-16 12:27:54 UTC (rev 1271)
+++ trunk/packages/advi/branches/split/debian/patches/no_bubble.dpatch 2005-04-16 12:56:50 UTC (rev 1272)
@@ -36,13 +36,3 @@
ADVIDIR=../..
-@@ -42,8 +42,7 @@
-
- all: $(DVIFILES)
- advi simple.dvi && \
-- advi moderate.dvi && \
-- advi bubbles.dvi
-+ advi moderate.dvi
-
- dvi : $(DVIFILES) $(MLPROG)
-