[Pkg-ocaml-maint-commits] r890 - in packages/advi: . branches branches/split/debian branches/split/debian/patches

Helge Kreutzmann kreutzm-guest@costa.debian.org
Tue, 11 Jan 2005 10:36:09 +0100


Author: kreutzm-guest
Date: 2005-01-11 10:36:09 +0100 (Tue, 11 Jan 2005)
New Revision: 890

Added:
   packages/advi/branches/
   packages/advi/branches/split/
   packages/advi/branches/split/debian/advi-examples.examples
   packages/advi/branches/split/debian/patches/no_bubble.dpatch
Modified:
   packages/advi/branches/split/debian/changelog
   packages/advi/branches/split/debian/control
   packages/advi/branches/split/debian/patches/00list
   packages/advi/branches/split/debian/rules
Log:
Branch to test package split (documentation) and for some other fixes by Helge Kreutzmann


Copied: packages/advi/branches/split (from rev 888, packages/advi/trunk)

Added: packages/advi/branches/split/debian/advi-examples.examples
===================================================================
--- packages/advi/trunk/debian/advi-examples.examples	2005-01-05 23:25:38 UTC (rev 888)
+++ packages/advi/branches/split/debian/advi-examples.examples	2005-01-11 09:36:09 UTC (rev 890)
@@ -0,0 +1,3 @@
+examples
+test
+Makefile.config

Modified: packages/advi/branches/split/debian/changelog
===================================================================
--- packages/advi/trunk/debian/changelog	2005-01-05 23:25:38 UTC (rev 888)
+++ packages/advi/branches/split/debian/changelog	2005-01-11 09:36:09 UTC (rev 890)
@@ -1,3 +1,9 @@
+advi (1.6.0-5) unstable; urgency=low
+
+  * Split off examples in their own package (Closes #233322).
+
+ -- Helge Kreutzmann <kreutzm@itp.uni-hannover.de>  Tue, 11 Jan 2005 10:30:21 +0100
+
 advi (1.6.0-4) unstable; urgency=low
 
   * Backing up pagemovement patch again, since it broke scaling.

Modified: packages/advi/branches/split/debian/control
===================================================================
--- packages/advi/trunk/debian/control	2005-01-05 23:25:38 UTC (rev 888)
+++ packages/advi/branches/split/debian/control	2005-01-11 09:36:09 UTC (rev 890)
@@ -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 (>> 3.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
+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
 Standards-Version: 3.6.1
 
 Package: advi
@@ -25,3 +25,19 @@
  security problems when viewing untrusted DVI files. make sure to read the
  README.Debian for more information
 
+Package: advi-examples
+Architecture: all
+Depends: tetex-bin, gs, advi, imagemagick
+Conflicts: advi (<< 1.6.0-4)
+Suggests: ttf-kochi-gothic, ttf-kochi-mincho, ocaml-base-nox, mpg321, tk8.4, xbase-clients, xterm
+Description: example presentations for Active-DVI (advi)
+ Active-DVI is a DVI previewer and presenter written in Objective Caml
+ (http://caml.inria.fr/ocaml/) 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. 
+ .
+ Some examples deploy applications currently not shipped by Debian
+ (mplayer, xanim) any may hence not present 100% as intended.

Modified: packages/advi/branches/split/debian/patches/00list
===================================================================
--- packages/advi/trunk/debian/patches/00list	2005-01-05 23:25:38 UTC (rev 888)
+++ packages/advi/branches/split/debian/patches/00list	2005-01-11 09:36:09 UTC (rev 890)
@@ -3,4 +3,10 @@
 japanese-fonts
 cache_dir
 bytecode
+fix_examples_includes
+fix_mon_seminar
+fix_test_includes
+neutralize_texinputs
+no_bubble
+set_test_cache_dir
 #pagemovement

Added: packages/advi/branches/split/debian/patches/no_bubble.dpatch
===================================================================
--- packages/advi/trunk/debian/patches/no_bubble.dpatch	2005-01-05 23:25:38 UTC (rev 888)
+++ packages/advi/branches/split/debian/patches/no_bubble.dpatch	2005-01-11 09:36:09 UTC (rev 890)
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+## no_bubble.dpatch by <kreutzm@itp.uni-hannover.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: There is no bubble.tex; fix makefile to not attempt to create
+## DP: bubble.tex (which of course fails)
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urN advi-1.6.0.orig/examples/basics/Makefile advi-1.6.0/examples/basics/Makefile
+--- advi-1.6.0.orig/examples/basics/Makefile	2003-11-07 13:15:01.000000000 +0100
++++ advi-1.6.0/examples/basics/Makefile	2005-01-01 19:50:01.000000000 +0100
+@@ -24,7 +24,7 @@
+ 
+ SUBDIRS=cash
+ 
+-TEXFILES= simple.tex moderate.tex bubbles.tex
++TEXFILES= simple.tex moderate.tex
+ 
+ ADVIDIR=../..
+ 
+@@ -42,8 +42,7 @@
+ 
+ all: $(DVIFILES)
+ 	advi simple.dvi && \
+-	advi moderate.dvi && \
+-	advi bubbles.dvi 
++	advi moderate.dvi
+ 
+ dvi : $(DVIFILES) $(MLPROG)
+ 


Property changes on: packages/advi/branches/split/debian/patches/no_bubble.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/advi/branches/split/debian/rules
===================================================================
--- packages/advi/trunk/debian/rules	2005-01-05 23:25:38 UTC (rev 888)
+++ packages/advi/branches/split/debian/rules	2005-01-11 09:36:09 UTC (rev 890)
@@ -7,7 +7,7 @@
 PACKAGE = advi
 VERSION = 1.4.0
 
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -74,7 +74,20 @@
 	        $(MAKE) allbyt; \
 	fi fi
 	#$(MAKE) documentation
+	ln -s tex/advilogo.eps test/
+	#ln -s tex/bar.eps test/
+	cd test && $(MAKE)
+	rm test/advilogo.eps
+	#rm test/bar.eps
+	cd test && rm -fR *~ *.aux *.cmi *.cmo *.log *.out *.ps *.toc a.out adviclock test_cursors test_gpic.tex .advi/*
 
+	ln -s tex/bar.eps examples/basics/
+	cd examples && $(MAKE)
+	rm examples/basics/bar.eps
+
+	#We copy the man file manually
+	cp -p doc_src/advi.man doc/advi.1
+
 	touch build-stamp
 
 clean: realclean unpatch backup-clean
@@ -85,6 +98,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp opt-built-stamp
+	rm -f doc/advi.1
 	-$(MAKE) veryclean
 	rm -f .depend
 	dh_clean
@@ -108,34 +122,51 @@
 
 # Build architecture-independent files here.
 binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i 
+	dh_installdocs -i
+	dh_installexamples -i -X\\.aux -X\\.cmi -X\\.cmo -X\\.log -X\\.out -X\\.toc
+	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
+	dh_installchangelogs -i
+	dh_compress -i -Xadviback.ppm -X.mp3 -Xtaquin -Xfumicamltrans.ppm -Xinria.ps
+	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
+	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
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	mv $(CURDIR)/debian/advi/usr/share/doc/advi/examples/examples \
-	   $(CURDIR)/debian/advi/usr/share/doc/advi/examples/upstream-examples
-	dh_installmenu
-	dh_installman doc/advi.1
-	dh_installchangelogs 
-	dh_link
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a
+	#dh_installexamples
+	dh_installmenu -a
+	dh_installman -a doc/advi.1
+	dh_installchangelogs -a
+	dh_link -a
 	if [ -e opt-built-stamp ]; then \
-		dh_strip; \
+		dh_strip -a; \
 	else \
-		dh_strip -Xadvi; \
+		dh_strip -a -Xadvi; \
 	fi
-	dh_compress
-	dh_fixperms
-	chmod 644 $(CURDIR)/debian/advi/usr/share/doc/advi/examples/upstream-examples/prosper/LL/pdfrotate.pl
-	chmod 644 $(CURDIR)/debian/advi/usr/share/doc/advi/examples/upstream-examples/basics/alltt.sty
-	chmod 644 $(CURDIR)/debian/advi/usr/share/doc/advi/examples/test/mmm.anim.gif
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_compress -a 
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install