[Pkg-ocaml-maint-commits] r1378 - tags/packages/advi tags/packages/advi/1.6.0-6/debian tags/packages/advi/1.6.0-6/debian/patches trunk/packages/advi/trunk/debian trunk/packages/advi/trunk/debian/patches

Ralf Treinen treinen@costa.debian.org
Fri, 13 May 2005 18:36:15 +0000 

Author: treinen
Date: 2005-05-13 18:36:14 +0000 (Fri, 13 May 2005)
New Revision: 1378

Added:
   tags/packages/advi/1.6.0-6/
   tags/packages/advi/1.6.0-6/debian/patches/examples-makefiles-texinputs.dpatch
   trunk/packages/advi/trunk/debian/patches/examples-makefiles-texinputs.dpatch
Modified:
   tags/packages/advi/1.6.0-6/debian/changelog
   tags/packages/advi/1.6.0-6/debian/control
   tags/packages/advi/1.6.0-6/debian/patches/00list
   trunk/packages/advi/trunk/debian/changelog
   trunk/packages/advi/trunk/debian/control
   trunk/packages/advi/trunk/debian/patches/00list
Log:
advi 1.0.6-6 - this is the version going into Sarge.


Copied: tags/packages/advi/1.6.0-6 (from rev 1377, trunk/packages/advi/trunk)

Modified: tags/packages/advi/1.6.0-6/debian/changelog
===================================================================
--- trunk/packages/advi/trunk/debian/changelog	2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/advi/1.6.0-6/debian/changelog	2005-05-13 18:36:14 UTC (rev 1378)
@@ -1,3 +1,13 @@
+advi (1.6.0-6) unstable; urgency=high
+
+  * Patch examples-makefiles-texinputs: fix TEXINPUTS variable in various
+    Makefiles in examples/ such advi styles are found even when the advi
+    package is not installed. Fixes FTBFS. (Closes: #307919).
+  * Fixed some typos in description, rephrased short and long descriptions a
+    bit (closes: #286454).
+
+ -- Ralf Treinen <treinen@debian.org>  Fri,  6 May 2005 20:51:05 +0200
+
 advi (1.6.0-5) unstable; urgency=low
 
   * Split off examples and manual in their own package (Closes: #233322).

Modified: tags/packages/advi/1.6.0-6/debian/control
===================================================================
--- trunk/packages/advi/trunk/debian/control	2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/advi/1.6.0-6/debian/control	2005-05-13 18:36:14 UTC (rev 1378)
@@ -11,19 +11,18 @@
 Depends: ${shlibs:Depends}, tetex-bin, gs
 Suggests: ttf-kochi-gothic, ttf-kochi-mincho, bzip2
 Replaces: mldvi, activedvi
-Description: a DVI previewer and presenter written in Objective Caml
+Description: an active DVI previewer and presenter
  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 :).
+ 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 :).
  .
  Active-DVI does not (yet) support postscript fonts (see the README.Debian for
  more details).
  .
  Active-DVI also has the ability to run embedded commands, which may cause
- security problems when viewing untrusted DVI files. make sure to read the
- README.Debian for more information
+ security problems when viewing untrusted DVI files. Make sure to read the
+ README.Debian for more information.
 
 Package: advi-examples
 Architecture: all
@@ -32,9 +31,8 @@
 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 :).
+ 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. 

Modified: tags/packages/advi/1.6.0-6/debian/patches/00list
===================================================================
--- trunk/packages/advi/trunk/debian/patches/00list	2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/advi/1.6.0-6/debian/patches/00list	2005-05-13 18:36:14 UTC (rev 1378)
@@ -14,3 +14,4 @@
 xanim_to_animate
 man_update
 #pagemovement
+examples-makefiles-texinputs

Added: tags/packages/advi/1.6.0-6/debian/patches/examples-makefiles-texinputs.dpatch
===================================================================
--- trunk/packages/advi/trunk/debian/patches/examples-makefiles-texinputs.dpatch	2005-05-12 22:20:11 UTC (rev 1377)
+++ tags/packages/advi/1.6.0-6/debian/patches/examples-makefiles-texinputs.dpatch	2005-05-13 18:36:14 UTC (rev 1378)
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## example-makefiles-texinputs.dpatch by Ralf Treinen <treinen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix TEXINPUTS in various Makefiles such that advi styles are
+## DP: found even when the advi package is not installed.
+
+@DPATCH@
+--- advi-1.6.0/examples/seminar/Makefile 
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/seminar/Makefile
+@@ -22,6 +22,7 @@
+ 
+ # To view the demos, use ../advi.opt file.dvi
+ 
++export TEXINPUTS=../../../tex:
+ SUBDIRS=clock a14
+ 
+ all:
+
+--- advi-1.6.0/examples/slitex/advi/Makefile
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/slitex/advi/Makefile 
+@@ -23,6 +23,7 @@
+ # To view the demos, use ../../../advi.opt file.dvi
+ 
+ LATEX=latex
++export TEXINPUTS=../../../tex:
+ 
+ #OSTYLES=~/lib/tex/STYLES
+ 
+
+--- advi-1.6.0/examples/slitex/caml/Makefile 
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/slitex/caml/Makefile
+@@ -23,6 +23,7 @@
+ # To view the demos, use ../../../advi.opt file.dvi
+ 
+ LATEX=latex
++export TEXINPUTS=../../../tex:
+ 
+ #OSTYLES=~/lib/tex/STYLES
+ 
+
+--- advi-1.6.0/examples/slitex/simplistic/Makefile 
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/slitex/simplistic/Makefile 
+@@ -40,7 +40,7 @@
+ talk.dvi: talk.tex
+ 
+ .tex.dvi:
+-	@ TEXINPUTS=$(OSTYLES):$$TEXINPUTS; export TEXINPUTS; latex $<
++	@ TEXINPUTS=$(OSTYLES):../../../tex:$$TEXINPUTS; export TEXINPUTS; latex $<
+ 
+ ps:
+ 	dvips -o talk.ps -t landscape talk.dvi
+
+--- advi-1.6.0/examples/slitex/skin_detection/Makefile
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/slitex/skin_detection/Makefile
+@@ -22,6 +22,8 @@
+ 
+ # To view the demos, use ../../../advi.opt file.dvi
+ 
++export TEXINPUTS=../../../tex:
++
+ all: skin_detection.dvi see
+ 
+ edit:


Property changes on: tags/packages/advi/1.6.0-6/debian/patches/examples-makefiles-texinputs.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/advi/trunk/debian/changelog
===================================================================
--- trunk/packages/advi/trunk/debian/changelog	2005-05-12 22:20:11 UTC (rev 1377)
+++ trunk/packages/advi/trunk/debian/changelog	2005-05-13 18:36:14 UTC (rev 1378)
@@ -1,3 +1,13 @@
+advi (1.6.0-6) unstable; urgency=high
+
+  * Patch examples-makefiles-texinputs: fix TEXINPUTS variable in various
+    Makefiles in examples/ such advi styles are found even when the advi
+    package is not installed. Fixes FTBFS. (Closes: #307919).
+  * Fixed some typos in description, rephrased short and long descriptions a
+    bit (closes: #286454).
+
+ -- Ralf Treinen <treinen@debian.org>  Fri,  6 May 2005 20:51:05 +0200
+
 advi (1.6.0-5) unstable; urgency=low
 
   * Split off examples and manual in their own package (Closes: #233322).

Modified: trunk/packages/advi/trunk/debian/control
===================================================================
--- trunk/packages/advi/trunk/debian/control	2005-05-12 22:20:11 UTC (rev 1377)
+++ trunk/packages/advi/trunk/debian/control	2005-05-13 18:36:14 UTC (rev 1378)
@@ -11,19 +11,18 @@
 Depends: ${shlibs:Depends}, tetex-bin, gs
 Suggests: ttf-kochi-gothic, ttf-kochi-mincho, bzip2
 Replaces: mldvi, activedvi
-Description: a DVI previewer and presenter written in Objective Caml
+Description: an active DVI previewer and presenter
  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 :).
+ 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 :).
  .
  Active-DVI does not (yet) support postscript fonts (see the README.Debian for
  more details).
  .
  Active-DVI also has the ability to run embedded commands, which may cause
- security problems when viewing untrusted DVI files. make sure to read the
- README.Debian for more information
+ security problems when viewing untrusted DVI files. Make sure to read the
+ README.Debian for more information.
 
 Package: advi-examples
 Architecture: all
@@ -32,9 +31,8 @@
 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 :).
+ 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. 

Modified: trunk/packages/advi/trunk/debian/patches/00list
===================================================================
--- trunk/packages/advi/trunk/debian/patches/00list	2005-05-12 22:20:11 UTC (rev 1377)
+++ trunk/packages/advi/trunk/debian/patches/00list	2005-05-13 18:36:14 UTC (rev 1378)
@@ -14,3 +14,4 @@
 xanim_to_animate
 man_update
 #pagemovement
+examples-makefiles-texinputs

Added: trunk/packages/advi/trunk/debian/patches/examples-makefiles-texinputs.dpatch
===================================================================
--- trunk/packages/advi/trunk/debian/patches/examples-makefiles-texinputs.dpatch	2005-05-12 22:20:11 UTC (rev 1377)
+++ trunk/packages/advi/trunk/debian/patches/examples-makefiles-texinputs.dpatch	2005-05-13 18:36:14 UTC (rev 1378)
@@ -0,0 +1,64 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## example-makefiles-texinputs.dpatch by Ralf Treinen <treinen@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix TEXINPUTS in various Makefiles such that advi styles are
+## DP: found even when the advi package is not installed.
+
+@DPATCH@
+--- advi-1.6.0/examples/seminar/Makefile 
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/seminar/Makefile
+@@ -22,6 +22,7 @@
+ 
+ # To view the demos, use ../advi.opt file.dvi
+ 
++export TEXINPUTS=../../../tex:
+ SUBDIRS=clock a14
+ 
+ all:
+
+--- advi-1.6.0/examples/slitex/advi/Makefile
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/slitex/advi/Makefile 
+@@ -23,6 +23,7 @@
+ # To view the demos, use ../../../advi.opt file.dvi
+ 
+ LATEX=latex
++export TEXINPUTS=../../../tex:
+ 
+ #OSTYLES=~/lib/tex/STYLES
+ 
+
+--- advi-1.6.0/examples/slitex/caml/Makefile 
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/slitex/caml/Makefile
+@@ -23,6 +23,7 @@
+ # To view the demos, use ../../../advi.opt file.dvi
+ 
+ LATEX=latex
++export TEXINPUTS=../../../tex:
+ 
+ #OSTYLES=~/lib/tex/STYLES
+ 
+
+--- advi-1.6.0/examples/slitex/simplistic/Makefile 
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/slitex/simplistic/Makefile 
+@@ -40,7 +40,7 @@
+ talk.dvi: talk.tex
+ 
+ .tex.dvi:
+-	@ TEXINPUTS=$(OSTYLES):$$TEXINPUTS; export TEXINPUTS; latex $<
++	@ TEXINPUTS=$(OSTYLES):../../../tex:$$TEXINPUTS; export TEXINPUTS; latex $<
+ 
+ ps:
+ 	dvips -o talk.ps -t landscape talk.dvi
+
+--- advi-1.6.0/examples/slitex/skin_detection/Makefile
++++ /tmp/dpep.OWUFv4/advi-1.6.0/examples/slitex/skin_detection/Makefile
+@@ -22,6 +22,8 @@
+ 
+ # To view the demos, use ../../../advi.opt file.dvi
+ 
++export TEXINPUTS=../../../tex:
++
+ all: skin_detection.dvi see
+ 
+ edit:


Property changes on: trunk/packages/advi/trunk/debian/patches/examples-makefiles-texinputs.dpatch
___________________________________________________________________
Name: svn:executable
   + *