[Pkg-ocaml-maint-commits] [SCM] advi packaging branch, master, updated. debian/1.9-2-8-gcdd5af2
Ralf Treinen
treinen at free.fr
Tue Mar 23 22:05:59 UTC 2010
The following commit has been merged in the master branch:
commit 9b93239dbe023be820e05004852c91ccbe3197b9
Author: Ralf Treinen <treinen at free.fr>
Date: Tue Mar 23 21:58:04 2010 +0100
package 1.9.0~rc1
diff --git a/debian/NEWS b/debian/NEWS
index c13285e..0047236 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,11 @@
+advi (1.9.0~rc1-1) UNRELEASED; urgency=low
+
+ The zadvi wrapper script has been removed from the advi package since
+ advi is now able to read directly gzipped or b2zipped dvi files.
+
+
+ -- Ralf Treinen <treinen at debian.org> Tue, 23 Mar 2010 21:51:31 +0100
+
advi (1.8-1) experimental; urgency=low
The debian version of advi does not load the .advirc file from the
diff --git a/debian/changelog b/debian/changelog
index 71b7ee2..b2ad032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+advi (1.9.0~rc1-1) UNRELEASED; urgency=low
+
+ * New upstream version (release candidat for 1.9.0)
+ * Remove patch cache-dir-tilde-expansion, as this is now integrated by
+ upstream.
+ * Remove patch use-ghostscript as upstream has fixed his configuration
+ script. Invoke ./configure with option --with-gs.
+ * Removed patch as upstream has updated his manpage, and since zadvi has
+ disappeared from he package.
+ * Removed zadvi from the package since advi now can directly read
+ gzipped dvi files. Add an entry about this is debian/NEWS.
+
+ -- Ralf Treinen <treinen at debian.org> Tue, 23 Mar 2010 21:51:31 +0100
+
advi (1.9-2) unstable; urgency=low
* Upload to unstable. Besides, no change w.r.t. 1.9-1.
diff --git a/debian/patches/cache-dir-tilde-expansion b/debian/patches/cache-dir-tilde-expansion
deleted file mode 100644
index b1634b3..0000000
--- a/debian/patches/cache-dir-tilde-expansion
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Stefano Zacchiroli <zack at debian.org>
-Date: Fri, 24 Apr 2009 00:11:24 +0200
-Subject: [PATCH] Cache dir
-Sent-to-upstream: Didier Remy <Didier.Remy at inria.fr>, 2010/03/17
-
---- a/src/userfile.ml
-+++ b/src/userfile.ml
-@@ -224,6 +224,12 @@ let get_user_advi_cache_dir () =
- let advi_cache_dir = ref None;;
-
- let set_advi_cache_dir d =
-+ let d =
-+ if d.[0] = '~' then
-+ mk_user_advi_cache_dir (tilde_subst d)
-+ else
-+ d
-+ in
- if can_be_cache_directory d then begin
- Misc.debug_endline (Printf.sprintf "Using %s as cache directory." d);
- advi_cache_dir := Some d end else
---
-1.6.2.1
-
diff --git a/debian/patches/manpage b/debian/patches/manpage
deleted file mode 100644
index 8784731..0000000
--- a/debian/patches/manpage
+++ /dev/null
@@ -1,396 +0,0 @@
-Author: Helge Kreutzmann <kreutzm at itp.uni-hannover.de>
-Description: numerous improvements for the man page (though more are possible)
- including a Debian-specific reference to zadvi
-Debian-bug: #286456
-Sent-to-upstream: Didier Remy <Didier.Remy at inria.fr> 2010/03/17
-
---- a/doc/advi.1
-+++ b/doc/advi.1
-@@ -15,11 +15,11 @@
- .\" .br insert line break
- .\" .sp <n> insert n+1 empty lines
- .\" for manpage-specific macros, see man(7)
-+.mso www.tmac
- .SH NAME
- .B advi
- \-\- a DVI previewer and presenter
--.UR http://caml.inria.fr/advi/
--(http://caml.inria.fr/advi/)
-+.\" .URL http://caml.inria.fr/advi/ http://caml.inria.fr/advi/
- .UE
- with some eye candy effects for presentation.
-
-@@ -28,13 +28,18 @@ Active\-DVI version $version
- .SH SYNOPSIS
- .B advi
- .RI [ options ] " dvifile " ...
-+
-+.B zadvi
-+.RI [ options ] " dvifile.gz | dvifile.bz2 " ...
- .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.
-+companion
-+.I advi.sty
-+LaTeX package.
-
- .P
- .B advi
-@@ -47,6 +52,11 @@ application may display its material on a devoted area of the slide,
- leading for example to live and/or interactive demos during the
- presentation.
-
-+.P
-+Compressed dvi-files (suffix .gz and .bz2) are supported via the
-+.B zadvi
-+command.
-+
- .SH CURRENTLY SUPPORTED FEATURES:
-
- \- Encapsulated Postscript File inclusion (using graphics package)
-@@ -55,9 +65,13 @@ presentation.
-
- \- Embedded applications for interactive demonstration
-
--\- Pictures visualization via gpic specials
-+\- Pictures visualization via
-+.BR gpic (1)
-+specials
-+
-+\- Display of inlined Postscript using
-+.BR gs (1)
-
--\- Display of inlined Postscript using gs
-
- \- Font antialiasing that takes background colors into account
-
-@@ -96,7 +110,9 @@ table of contents or as small images set up on a page)
-
- Notice that
- .B advi
--needs the `kpsewhich' tool in order to find and
-+needs the
-+.BR kpsewhich (1)
-+tool in order to find and
- recompile PK fonts. (This program is part of the `kpathsea' library
- provided by many TeX distributions.)
-
-@@ -113,7 +129,9 @@ Debug page motion
- Ignore background for antialiasing
- .TP
- .B \-\-showps
--Print a copy of Postscript sent to gs to stdout
-+Print a copy of Postscript sent to
-+.BR gs (1)
-+to stdout
- .TP
- .B \-\-verbose\-image\-access
- Change the cursor while loading images
-@@ -138,7 +156,8 @@ Set default background color (Named or RGB)
- Command to call the browser (default netscape\-communicator)
- .TP
- .B \-cache\-dir STRING
--Set the cache directory (default /tmp)
-+Set the cache directory (default
-+.IR /tmp )
- .TP
- .B \-click\-turn
- Turn pages with mouse clicks (see the doc)
-@@ -147,7 +166,7 @@ Turn pages with mouse clicks (see the doc)
- Crop the window to the best size (default)
- .TP
- .B \-disable\-image\-anti\-aliasing
--Disable eps inclusion anti\-aliasing
-+Disable EPS inclusion anti\-aliasing
- .TP
- .B \-edit
- Start in edit mode
-@@ -162,7 +181,8 @@ Draw in the foreground
- Set default foreground color (Named or RGB)
- .TP
- .B \-film\-viewer STRING
--Command to display film files (default mplayer)
-+Command to display film files (default
-+.BR mplayer (1))
- .TP
- .B \-fullwidth
- Adjust size to width
-@@ -182,7 +202,7 @@ Horizontal margin (default: 1cm)
- .B \-html STRING
- Make
- .B advi
--start at html reference of name STRING
-+start at HTML reference of name STRING
- .TP
- .B \-image\-viewer STRING
- Command to display image files (default xv)
-@@ -216,7 +236,11 @@ 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).
-+(to override the options of the default
-+.I ~/.advirc
-+or
-+.I ~/.advi/advirc
-+init file)
- .TP
- .B \-page INT
- Make
-@@ -232,7 +256,7 @@ to write the current page number in a file (default is no)
- 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).
-+(default is file 'advi\_page\_number' in the cache directory)
- .TP
- .B \-pager STRING
- Command to call the pager (default xterm \-e less)
-@@ -241,19 +265,21 @@ Command to call the pager (default xterm \-e less)
- Cancel all Active\-DVI effects
- .TP
- .B \-pdf\-viewer STRING
--Command to view PDF files (default xpdf)
-+Command to view PDF files (default
-+.BR xpdf (1))
- .TP
- .B \-ps\-viewer STRING
--Command to view PS files (default gv)
-+Command to view PS files (default
-+.BR gv (1))
- .TP
- .B \-pstricks
- Show moveto
- .TP
- .B \-resolution REAL
--Dpi resolution of the screen (min 72.27)))
-+DPI resolution of the screen (min. 72.27)))
- .TP
- .B \-rv
--Reverse video is simulated by swapping the foreground and background colors.
-+Reverse video is simulated by swapping the foreground and background colors
- .TP
- .B \-safer
- Safer mode: external applications are never launched
-@@ -277,10 +303,10 @@ Set the width of the pen used when scratching slides (default 2)
- Set the number of thumbname per line and column to INT
- .TP
- .B \-thumbnails
--Create thumbnails for your slides and write them into cachedir.
-+Create thumbnails for your slides and write them into cachedir
- .TP
- .B \-thumbnails\-size STRING
--Fix thumbnails size (default 24x32).
-+Fix thumbnails size (default 24x32)
- .TP
- .B \-v
- Print the current Active\-DVI version
-@@ -302,7 +328,7 @@ Display this list of options
-
- .P
- Geometry GEOM is specified in pixels, using the standard format
--for specifying geometries (i.e: "WIDTHxHEIGHT[+XOFFSET+YOFFSET]").
-+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.
-@@ -326,41 +352,41 @@ original TeX source.
- 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.
-+value is 1.
-
- Advi maintains an history of previously visited pages organized as a stack.
--Additionnally, the history contains mark pages which are stronger than
-+Additionally, the history contains mark pages which are stronger than
- unmarked pages.
-
- .RS 2
- .TP 8
- .B ?
--Quick info and key bindings help
-+Quick info and key bindings help.
-
- .TP
- .B q
--Quits the program
-+Quits the program.
-
- .TP
- .B ^X\-^C (Control\-X Control\-C)
--Quits the program
-+Quits the program.
-
- .TP
- .B ^X\-^F (Control\-X Control\-F)
--Turn to full screen mode
-+Turn to full screen mode.
-
- .TP
- .B ^F (Control\-F)
--Toggle to switch from full screen to normal mode and converse
-+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)
-+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.
-+forward ARG physical pages.
-
- .TP
- .B n
-@@ -381,7 +407,7 @@ 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.
-+The history stack is popped, accordingly.
-
- .TP
- .B <escape>
-@@ -409,11 +435,11 @@ 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)))
-+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)))
-+Scale the resolution by scalestep (default sqrt (sqrt (sqrt 2.0))).
-
- .TP
- .B f
-@@ -436,34 +462,34 @@ Reload the file and redraw the current page.
-
- .TP
- .B C
--Erase the image cache
-+Erase the image cache.
-
- .TP
- .B T
--Process thumbnails (graphical table of contents for the show)
-+Process thumbnails (graphical table of contents for the show).
-
- .TP
- .B t
- Display thumbnails if processed or floating table of contents, or do
--nothing
-+nothing.
-
- .TP
- .B ^X\-l (Control\-X l)
--Toggle on or off the laser pointer
-+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
-+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
-+to get help.
-
- .TP
- .B ^X\-^S (Control\-X Control\-S)
-@@ -489,19 +515,24 @@ 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.
-+Using the LaTeX style
-+.I 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
-+presentation. For the casual user, the
-+.I advi\-slides.sty
-+package gives
-+a truly 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).
-+.I advi\-slides.sty
-+file for more information).
-
- .TP
- .B \eadviwait
--ActiveDvi stops rendering at the point of the document and wait a user key
-+Active\-DVI stops rendering at the point of the document and wait a user key
- stroke.
-
- .TP
-@@ -529,7 +560,11 @@ 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
-+Please look also at
-+.I test/demo*.{tex|dvi}
-+and
-+.I test/macros.{tex|dvi}
-+for
- a rather comprehensive demonstration of Active\-DVI capabilities.
-
- .SH COPYRIGHT
-@@ -537,22 +572,25 @@ 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
-+the Active\-DVI user's
-+.URL http://caml.inria.fr/advi/manual.dvi manual ,
-+and the
-+.URL http://caml.inria.fr/advi/faq.html FAQ
- .SH AUTHORS
- Jun Furuse <Jun.Furuse at inria.fr>
- Pierre Weis <Pierre.Weis at inria.fr>
--Didier Remy <Didier.Remy at inria.fr> inlined Postcript, hyperlinks
-+Didier Remy <Didier.Remy at inria.fr> inlined Postscript, hyperlinks
- Roberto Di Cosmo <dicosmo at pauillac.inria.fr>
--Xavier Leroy <Xavier.Leroy at inria.fr> gpic specials
-+Xavier Leroy <Xavier.Leroy at inria.fr>
-+.BR gpic (1)
-+specials
- Didier Le Botlan <Didier.Le_Botlan at inria.fr>
- Alan Schmitt <Alan.Schmitt at inria.fr>
- Alexandre Miquel <Alexandre.Miquel at inria.fr>
- .P
- The original version of this manual page was written by Sven LUTHER
--<luther at debian.org>, for the Debian GNU/Linux system port of advi
-+<luther at debian.org>, for the Debian GNU/Linux system port of
-+.B 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
-+versions of Active\-DVI, and finally rewritten for version 1.6 by
- Pierre Weis.
---
-1.6.2.1
-
diff --git a/debian/patches/series b/debian/patches/series
index a8a9c2b..272134a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,7 @@
japanese-fonts
-cache-dir-tilde-expansion
# byte-compilation-no-custom
manpage
no-local-advirc
-use-ghostscript
use-data-dir
doc-without-htmlc
examples-phony-targets
diff --git a/debian/patches/use-ghostscript b/debian/patches/use-ghostscript
deleted file mode 100644
index 464870c..0000000
--- a/debian/patches/use-ghostscript
+++ /dev/null
@@ -1,40 +0,0 @@
-Author: Ralf Treinen <treinen at debian.org>
-Description: Let configure behave as if ghostscript where installed at
- compilation time.
-
-Index: advi/configure
-===================================================================
---- advi.orig/configure 2010-03-10 21:09:15.000000000 +0100
-+++ advi/configure 2010-03-10 21:09:19.000000000 +0100
-@@ -6698,30 +6698,7 @@
-
-
-
--if test -n "$GS" ; then
-- { echo "$as_me:$LINENO: checking if gs version >= 6.52" >&5
--echo $ECHO_N "checking if gs version >= 6.52... $ECHO_C" >&6; }
-- gs_version=`$GS -v | awk '/Ghostscript/ {print $3}'`
-- gs_major_version=`echo $gs_version | cut -d. -f1`
-- gs_minor_version=`echo $gs_version | cut -d. -f2`
--
-- if expr \
-- \( $gs_major_version \> 6 \) \
-- \| \
-- \( \
-- \( $gs_major_version \= 6 \) \
-- \& \
-- \( $gs_minor_version \>= 52 \) \
-- \) > /dev/null; then
-- { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
-- HAVE_GS="true"
-- else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
-- GS=""
-- fi
--fi
-+HAVE_GS="true"
-
-
- ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile doc/pngs/Makefile tex/Makefile"
diff --git a/debian/rules b/debian/rules
index cf9edeb..b639fe3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,8 @@ override_dh_auto_configure:
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info
+ --infodir=\$${prefix}/share/info \
+ --with-gs=/usr/bin/ghostscript
override_dh_auto_build:
$(MAKE)
diff --git a/debian/utils/zadvi b/debian/utils/zadvi
deleted file mode 100755
index 14e42e5..0000000
--- a/debian/utils/zadvi
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# Launcher script for advi with support for .gz and .bz2 files
-# Copyright (C) 2003
-# Stefano Zacchiroli <zack at debian.org>,
-# Sylvain LE GALL <sylvain.le-gall at polytechnique.org>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# See /usr/share/common-licenses/GPL on a Debian GNU/Linux system.
-
-ADVI="/usr/bin/advi"
-UNZIP="/bin/gunzip"
-BUNZIP="/usr/bin/bunzip2"
-RM="/bin/rm"
-UNGZFILE=""
-DVIFILE=""
-
-# Using trap to handle all signals that can be send / received
-# and send it to advi
-
-SIGNALS=" 1 2 3 4 5 6 7 8 9 10 11\
- 12 13 14 15 17 18 19 20 21 22 23\
- 24 25 26 27 28 29 30 31 35 36 37\
- 38 39 40 41 42 43 44 45 46 47 48\
- 49 50 51 52 53 54 55 56 57 58 59\
- 60 61 62 63 64"
-
-for i in $*; do
- case $i in
- *.gz)
- TMPFILE=`tempfile -p advi_ -s .dvi`
- if [ -x $UNZIP ]; then
- $UNZIP -c $i > $TMPFILE
- UNGZFILE="$UNGZFILE $TMPFILE"
- DVIFILE="$DVIFILE $TMPFILE"
- else
- echo "Cannot find $UNZIP"
- fi
- ;;
- *.bz2)
- TMPFILE=`tempfile -p advi_ -s .dvi`
- if [ -x $BUNZIP ]; then
- $BUNZIP -c $i > $TMPFILE
- UNGZFILE="$UNGZFILE $TMPFILE"
- DVIFILE="$DVIFILE $TMPFILE"
- else
- echo "Cannot find $BUNZIP"
- fi
- ;;
- *)
- DVIFILE="$DVIFILE $i"
- ;;
- esac
-done
-
-$ADVI $DVIFILE
-
-$RM -f $UNGZFILE
-
--
advi packaging
More information about the Pkg-ocaml-maint-commits
mailing list