[Pkg-ocaml-maint-commits] r2358 - in trunk/packages/advi: . trunk
trunk/debian trunk/debian/patches upstream
Julien Cristau
jcristau-guest at costa.debian.org
Wed Jan 4 04:34:47 UTC 2006
Author: jcristau-guest
Date: 2006-01-04 04:34:46 +0000 (Wed, 04 Jan 2006)
New Revision: 2358
Added:
trunk/packages/advi/trunk/debian/patches/fix_unused_variables.dpatch
trunk/packages/advi/trunk/debian/svn-deblayout
trunk/packages/advi/upstream/
trunk/packages/advi/upstream/advi_1.6.0.orig.tar.gz
Removed:
trunk/packages/advi/trunk/advi_1.6.0.orig.tar.gz
Modified:
trunk/packages/advi/trunk/debian/
trunk/packages/advi/trunk/debian/changelog
trunk/packages/advi/trunk/debian/control
Log:
* Rebuild for ocaml 3.09.0.
* Don't build-dep on xlibs-dev.
* Add patch stolen from upstream CVS to build with the new ocaml and its new
"unused variable" warnings.
* Add myself to Uploaders.
* Switch to svn-buildpackage.
Deleted: trunk/packages/advi/trunk/advi_1.6.0.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/advi/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/packages/advi/trunk/debian/changelog
===================================================================
--- trunk/packages/advi/trunk/debian/changelog 2006-01-04 02:46:54 UTC (rev 2357)
+++ trunk/packages/advi/trunk/debian/changelog 2006-01-04 04:34:46 UTC (rev 2358)
@@ -1,3 +1,13 @@
+advi (1.6.0-7) unstable; urgency=low
+
+ * Rebuild for ocaml 3.09.0.
+ * Don't build-dep on xlibs-dev.
+ * Add patch stolen from upstream CVS to build with the new ocaml and its new
+ "unused variable" warnings.
+ * Add myself to Uploaders.
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org> Wed, 4 Jan 2006 05:32:26 +0100
+
advi (1.6.0-6) unstable; urgency=high
* Patch examples-makefiles-texinputs: fix TEXINPUTS variable in various
Modified: trunk/packages/advi/trunk/debian/control
===================================================================
--- trunk/packages/advi/trunk/debian/control 2006-01-04 02:46:54 UTC (rev 2357)
+++ trunk/packages/advi/trunk/debian/control 2006-01-04 04:34:46 UTC (rev 2358)
@@ -2,8 +2,8 @@
Section: tex
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Jerome Marant <jerome at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>, Michael K. Edwards (in Debian context) <mkedeb at sane.net>
-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
+Uploaders: Ralf Treinen <treinen at debian.org>, Sven Luther <luther at debian.org>, Jerome Marant <jerome at debian.org>, Remi Vanicat <vanicat at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sylvain Le Gall <sylvain.le-gall at polytechnique.org>, Michael K. Edwards (in Debian context) <mkedeb at sane.net>, Julien Cristau <julien.cristau at ens-lyon.org>
+Build-Depends: debhelper (>> 4.0.0), tetex-bin, ocaml, libcamlimages-ocaml-dev, tetex-extra, zlib1g-dev, gs, dpatch, chrpath, ocaml-best-compilers, hevea, x-dev, libx11-dev, libxinerama-dev
Standards-Version: 3.6.1
Package: advi
Added: trunk/packages/advi/trunk/debian/patches/fix_unused_variables.dpatch
===================================================================
--- trunk/packages/advi/trunk/debian/patches/fix_unused_variables.dpatch 2006-01-04 02:46:54 UTC (rev 2357)
+++ trunk/packages/advi/trunk/debian/patches/fix_unused_variables.dpatch 2006-01-04 04:34:46 UTC (rev 2358)
@@ -0,0 +1,429 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_unused_variables.dpatch by Julien Cristau <julien.cristau at ens-lyon.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from upstream CVS to fix build with ocaml 3.09 related to unused
+## DP: variables
+
+ at DPATCH@
+
+Index: addons.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/addons.ml,v
+retrieving revision 1.9
+retrieving revision 1.10
+diff -u -r1.9 -r1.10
+--- addons.ml 10 Oct 2003 12:45:27 -0000 1.9
++++ addons.ml 7 Dec 2004 20:48:03 -0000 1.10
+@@ -18,7 +18,7 @@
+ (* Predefined gradient color background drawing functions.
+ Roberto Di Cosmo, Pierre Weis. *)
+
+-(* $Id: addons.ml,v 1.9 2003/10/10 12:45:27 weis Exp $ *)
++(* $Id: addons.ml,v 1.10 2004/12/07 20:48:03 weis Exp $ *)
+
+ (* Gradients:
+ - h is horizontal,
+@@ -86,7 +86,7 @@
+
+ let cgradient {
+ argcolor = c0; argcolorstart = c1; argcolorstop = c2;
+- argfunviewport = {vx = x; vy = y; vw = w; vh = h} as viewport;
++ argfunviewport = {vx = x; vy = y; vw = w; vh = h} as _viewport;
+ argxcenter = xc; argycenter = yc;
+ argviewport = _;
+ } =
+@@ -96,7 +96,7 @@
+
+ let circgradient {
+ argcolor = c0; argcolorstart = c1; argcolorstop = c2;
+- argfunviewport = {vx = x; vy = y; vw = w; vh = h} as viewport;
++ argfunviewport = {vx = x; vy = y; vw = w; vh = h} as _viewport;
+ argxcenter = xc; argycenter = yc;
+ argviewport = _;
+ } =
+Index: driver.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/driver.ml,v
+retrieving revision 1.146
+retrieving revision 1.147
+diff -u -r1.146 -r1.147
+--- driver.ml 17 Oct 2004 20:33:35 -0000 1.146
++++ driver.ml 7 Dec 2004 20:48:03 -0000 1.147
+@@ -15,7 +15,7 @@
+ (* Based on Mldvi by Alexandre Miquel. *)
+ (***********************************************************************)
+
+-(* $Id: driver.ml,v 1.146 2004/10/17 20:33:35 remy Exp $ *)
++(* $Id: driver.ml,v 1.147 2004/12/07 20:48:03 weis Exp $ *)
+
+ open Misc;;
+
+@@ -437,7 +437,7 @@
+ | "color" :: "pop" :: [] ->
+ color_pop st
+ | "color" :: args ->
+- let c = Dvicolor.parse_color_args args in
++ let _c = Dvicolor.parse_color_args args in
+ Misc.warning "global color special is not supported"
+ | _ -> ill_formed_special s;;
+
+@@ -557,8 +557,6 @@
+ let y = st.y_origin + Misc.round (st.conv *. float st.v) in
+ if !visible then
+ if drawbygs then
+- let dx = st.x_origin in
+- let dy = st.y_origin in
+ Dev.draw_ps_by_gs file bbox (rwi, rhi)
+ (x - st.x_origin) (y - st.y_origin)
+ else
+@@ -1471,7 +1469,7 @@
+ let last = ref 0 in
+ let eval = function
+ | Dvicommands.C_xxx s when has_prefix "line: " s ->
+- let (l, f as location) = line_of_special s 6 in
++ let (l, f as _location) = line_of_special s 6 in
+ if f = filename then
+ begin
+ if !last <= line && line < l then
+@@ -1720,8 +1718,6 @@
+ let sdpi = Misc.round (mag *. ldexp dpi 16)
+ and mtable = ref dummy_mtable
+ and gtable = ref dummy_gtable in
+- let headers = ref []
+- and xrefs = cdvi.base_dvi.Cdvi.xrefs in
+ let otherwise = function
+ | Dvicommands.C_fnt n ->
+ let (mt, gt) =
+Index: dviview.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/dviview.ml,v
+retrieving revision 1.155
+retrieving revision 1.156
+diff -u -r1.155 -r1.156
+--- dviview.ml 17 Oct 2004 20:33:35 -0000 1.155
++++ dviview.ml 7 Dec 2004 20:48:03 -0000 1.156
+@@ -15,7 +15,7 @@
+ (* Based on Mldvi by Alexandre Miquel. *)
+ (***********************************************************************)
+
+-(* $Id: dviview.ml,v 1.155 2004/10/17 20:33:35 remy Exp $ *)
++(* $Id: dviview.ml,v 1.156 2004/12/07 20:48:03 weis Exp $ *)
+
+ let pauses =
+ Options.flag true "-nopauses"
+@@ -320,9 +320,7 @@
+ | In f -> float attr.geom.Ageometry.height /. (h_in +. 2.0 *. f)
+ | _ -> assert false in
+ let base_dpi = min wdpi hdpi in
+- let width = Misc.round (base_dpi *. w_in)
+- and height = Misc.round (base_dpi *. h_in)
+- and real_width = Misc.round (base_dpi *. w_in *. st.ratio)
++ let real_width = Misc.round (base_dpi *. w_in *. st.ratio)
+ and real_height = Misc.round (base_dpi *. h_in *. st.ratio) in
+ let fwidth = base_dpi *. w_in
+ and fheight = base_dpi *. h_in in
+@@ -371,7 +369,6 @@
+ try (Unix.stat filename).Unix.st_mtime
+ with _ -> 0.0 in
+ Gs.init_do_ps ();
+- let npages = Array.length dvi.Cdvi.pages in
+ let st =
+ let npages = Array.length dvi.Cdvi.pages in
+ { filename = filename;
+@@ -680,7 +677,6 @@
+ let num_nails = Array.length page_nails in
+ let r_fit = int_of_float (ceil (sqrt (float_of_int num_nails))) in
+ let r = min r_fit !thumbnail_limit in
+- let pages = num_nails - 1 / r / r in
+ let ist =
+ { st with
+ size_x = st.size_x / r;
+@@ -765,14 +761,6 @@
+ st.last_modified <- reload_time st;
+ let dvi = Cdvi.load st.filename in
+ let cdvi = Driver.cook_dvi dvi in
+- let dvi_res = !dpi_resolution
+- and mag = float dvi.Cdvi.preamble.Dvicommands.pre_mag /. 1000.0 in
+- let w_sp = dvi.Cdvi.postamble.Dvicommands.post_width
+- and h_sp = dvi.Cdvi.postamble.Dvicommands.post_height in
+- let w_in = mag *. ldexp (float w_sp /. dvi_res) (-16)
+- and h_in = mag *. ldexp (float h_sp /. dvi_res) (-16) in
+- let width = Misc.round (w_in *. st.base_dpi *. st.ratio)
+- and height = Misc.round (h_in *. st.base_dpi *. st.ratio) in
+ let npages = Array.length dvi.Cdvi.pages in
+ st.dvi <- dvi;
+ st.cdvi <- cdvi;
+@@ -830,7 +818,6 @@
+ let size_y = Graphics.size_y () in
+ let dx = size_x / r
+ and dy = size_y / r in
+- let pages = Array.length page / r / r in
+ Array.iteri
+ (fun p' (p, img) ->
+ let x = size_x * (p' mod r) / r in
+@@ -1377,13 +1364,13 @@
+ let search_forward st =
+ let re_string = ask_to_search "Search Forward (re): " in
+ Misc.warning (Printf.sprintf "Search forward %s" re_string);
+- let re = Str.regexp re_string in
++ let _re = Str.regexp re_string in
+ ()
+
+ let search_backward st =
+ let re_string = ask_to_search "Search Backward (re): " in
+ Misc.warning (Printf.sprintf "Search backward %s" re_string);
+- let re = Str.regexp re_string in
++ let _re = Str.regexp re_string in
+ ()
+
+ let duplex = duplex_switch false
+Index: grdev.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/grdev.ml,v
+retrieving revision 1.161
+retrieving revision 1.162
+diff -u -r1.161 -r1.162
+--- grdev.ml 3 Sep 2004 15:08:55 -0000 1.161
++++ grdev.ml 7 Dec 2004 20:48:03 -0000 1.162
+@@ -15,7 +15,7 @@
+ (* Based on Mldvi by Alexandre Miquel. *)
+ (***********************************************************************)
+
+-(* $Id: grdev.ml,v 1.161 2004/09/03 15:08:55 remy Exp $ *)
++(* $Id: grdev.ml,v 1.162 2004/12/07 20:48:03 weis Exp $ *)
+
+ open Misc;;
+
+@@ -429,8 +429,8 @@
+ within the background viewport we choose it;
+ otherwise, we choose the center of the background viewport. *)
+ let make_center xcr ycr
+- ({vx = x; vy = y; vw = w; vh = h} as bgviewport)
+- ({vx = fx; vy = fy; vw = fw; vh = fh} as funviewport) =
++ ({vx = x; vy = y; vw = w; vh = h} as _bgviewport)
++ ({vx = fx; vy = fy; vw = fw; vh = fh} as _funviewport) =
+ let xc = match xcr with
+ | Some xcr ->
+ (* Get the center coordinates integer values in the funviewport. *)
+@@ -917,7 +917,7 @@
+ Graphics.set_color (get_color ())
+
+ let make_anchors tag all_draw =
+- let make_anchor draw (x, y as orig) w h voff =
++ let make_anchor draw (x, y as _orig) w h voff =
+ let anchor = {tag = tag; draw = List.rev draw} in
+ let bw =
+ match tag with
+@@ -1607,7 +1607,7 @@
+ try match H.find ev.mouse_x ev.mouse_y with
+ | {A.action = {H.tag = H.Href h; H.draw = d}} as act ->
+ if ev.button then
+- let ev' = GraphicsY11.wait_next_event button_up in
++ let _ev' = GraphicsY11.wait_next_event button_up in
+ send (Href h) else
+ if H.up_to_date act emph then event emph b else begin
+ H.deemphasize true emph;
+Index: gs.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/gs.ml,v
+retrieving revision 1.42
+retrieving revision 1.43
+diff -u -r1.42 -r1.43
+--- gs.ml 7 Oct 2004 22:27:58 -0000 1.42
++++ gs.ml 7 Dec 2004 20:48:03 -0000 1.43
+@@ -15,7 +15,7 @@
+ (* Based on Mldvi by Alexandre Miquel. *)
+ (***********************************************************************)
+
+-(* $Id: gs.ml,v 1.42 2004/10/07 22:27:58 remy Exp $ *)
++(* $Id: gs.ml,v 1.43 2004/12/07 20:48:03 weis Exp $ *)
+
+ let debugs = Misc.debug_endline;;
+
+@@ -63,7 +63,6 @@
+
+ let parse_pos s =
+ let c = String.index s ',' in
+- let bc = s.[3] in
+ (* y comes first, then x *)
+ let y = String.sub s 3 (c - 3) in
+ let x = String.sub s (c + 1) (String.length s - c - 1) in
+@@ -106,10 +105,10 @@
+ try
+ Unix.select fd_in fd_out fd_exn timeout
+ with
+- Unix.Unix_error (Unix.EINTR, _, _) as exn ->
+- let now = Unix.gettimeofday () in
+- let remaining = start +. timeout -. now in
+- if remaining > 0.0 then select fd_in fd_out fd_exn timeout else [], [], []
++ | Unix.Unix_error (Unix.EINTR, _, _) ->
++ let now = Unix.gettimeofday () in
++ let remaining = start +. timeout -. now in
++ if remaining > 0.0 then select fd_in fd_out fd_exn timeout else [], [], []
+ ;;
+
+ class gs () =
+Index: gterm.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/gterm.ml,v
+retrieving revision 1.18
+retrieving revision 1.19
+diff -u -r1.18 -r1.19
+--- gterm.ml 9 Oct 2003 14:10:45 -0000 1.18
++++ gterm.ml 7 Dec 2004 20:48:03 -0000 1.19
+@@ -15,7 +15,7 @@
+ (* Based on Mldvi by Alexandre Miquel. *)
+ (***********************************************************************)
+
+-(* $Id: gterm.ml,v 1.18 2003/10/09 14:10:45 weis Exp $ *)
++(* $Id: gterm.ml,v 1.19 2004/12/07 20:48:03 weis Exp $ *)
+
+ (* A simple terminal to handle simple editions and user's interaction. *)
+
+@@ -361,7 +361,7 @@
+ (* Basic functions to input strings. *)
+ let rec flush_keys () =
+ if GraphicsY11.key_pressed () then
+- let c = GraphicsY11.read_key () in
++ let _c = GraphicsY11.read_key () in
+ flush_keys ();;
+
+ type prompt = string;;
+@@ -371,8 +371,7 @@
+ let b = Buffer.create 11 in
+ let get t =
+ flush_keys ();
+- let limx = t.cursor_x
+- and limy = t.cursor_y in
++ let limx = t.cursor_x in
+ let rec read t =
+ let c = get_next_key t in
+ match c with
+Index: laser_pointer.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/laser_pointer.ml,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -r1.7 -r1.8
+--- laser_pointer.ml 15 Sep 2004 16:37:55 -0000 1.7
++++ laser_pointer.ml 7 Dec 2004 20:48:03 -0000 1.8
+@@ -18,7 +18,7 @@
+ (* A laser pointer to point to the slides.
+ Pierre Weis. *)
+
+-(* $Id: laser_pointer.ml,v 1.7 2004/09/15 16:37:55 weis Exp $ *)
++(* $Id: laser_pointer.ml,v 1.8 2004/12/07 20:48:03 weis Exp $ *)
+ open Graphics;;
+
+ let not_the_pointer_color = Graphics.background;;
+@@ -144,7 +144,7 @@
+ | { mouse_x = x; mouse_y = y;
+ button = btn;
+ keypressed = kp;
+- key = c; } as ev ->
++ key = c; } ->
+ show_pointer ptr x y;
+ if kp then begin
+ match c with
+Index: misc.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/misc.ml,v
+retrieving revision 1.35
+retrieving revision 1.36
+diff -u -r1.35 -r1.36
+--- misc.ml 11 Aug 2004 22:08:06 -0000 1.35
++++ misc.ml 7 Dec 2004 20:48:03 -0000 1.36
+@@ -15,7 +15,7 @@
+ (* Based on Mldvi by Alexandre Miquel. *)
+ (***********************************************************************)
+
+-(* $Id: misc.ml,v 1.35 2004/08/11 22:08:06 weis Exp $ *)
++(* $Id: misc.ml,v 1.36 2004/12/07 20:48:03 weis Exp $ *)
+
+ (* General type abbrevs. *)
+ type file_name = string;;
+@@ -114,7 +114,6 @@
+
+ (* Strings auxilliaries. *)
+ let string_prefix char s =
+- let l = String.length s in
+ let i = String.index s char in
+ String.sub s 0 (i + 1);;
+
+@@ -180,7 +179,6 @@
+
+ let string_substitute_var f s =
+ let b = Buffer.create (String.length s * 2) in
+- let len = String.length s in
+ let rec loop ib =
+ Scanf.bscanf ib "%c" (function
+ | '@'
+@@ -192,7 +190,7 @@
+ end;
+ loop ib)
+ | c -> Buffer.add_char b c; loop ib) in
+- try loop (Scanf.Scanning.from_string s); Buffer.contents b with
++ try loop (Scanf.Scanning.from_string s) with
+ | _ -> Buffer.contents b;;
+
+ let string_replace pat templ str =
+Index: symbol.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/symbol.ml,v
+retrieving revision 1.36
+retrieving revision 1.37
+diff -u -r1.36 -r1.37
+--- symbol.ml 1 Oct 2004 11:13:35 -0000 1.36
++++ symbol.ml 7 Dec 2004 20:48:03 -0000 1.37
+@@ -15,7 +15,7 @@
+ (* Based on Mldvi by Alexandre Miquel. *)
+ (***********************************************************************)
+
+-(* $Id: symbol.ml,v 1.36 2004/10/01 11:13:35 weis Exp $ *)
++(* $Id: symbol.ml,v 1.37 2004/12/07 20:48:03 weis Exp $ *)
+
+ type color = GraphicsY11.color;;
+
+@@ -555,7 +555,6 @@
+ let around b x y =
+ try
+ let position = position x y in
+- let space_ref = position.history.(position.first) in
+ let valid = valid position in
+ let rec skip_spaces move i =
+ if valid i then
+@@ -576,7 +575,6 @@
+ | Rule (_, _) -> return w
+ | _ ->
+ if pre <> dummy_symbol && above pre h <> 0 then return w else
+- let c = symbol_name pre h in
+ let add x y = if move 0 > 0 then x ^ y else y ^ x in
+ word move i (add (true_symbol_name h) w) next
+ else -1, w in
+Index: ttfont.ml
+===================================================================
+RCS file: /caml/bazar-ocaml/advi/ttfont.ml,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- ttfont.ml 6 Jan 2003 10:49:14 -0000 1.2
++++ ttfont.ml 7 Dec 2004 20:48:03 -0000 1.3
+@@ -15,7 +15,7 @@
+ (* Based on Mldvi by Alexandre Miquel. *)
+ (***********************************************************************)
+
+-(* $Id: ttfont.ml,v 1.2 2003/01/06 10:49:14 weis Exp $ *)
++(* $Id: ttfont.ml,v 1.3 2004/12/07 20:48:03 weis Exp $ *)
+
+ open Freetype;;
+
+@@ -52,7 +52,7 @@
+
+ let build face dpi pt unicode =
+ set_char_size face (float dpi) (float dpi) pt pt;
+- let advx, advy = render_char face unicode [] Render_Mono in
++ let _advx, _advy = render_char face unicode [] Render_Mono in
+ let bitmapinfo = get_bitmap_info face in
+ let width = bitmapinfo.bitmap_width in
+ let height = bitmapinfo.bitmap_height in
Added: trunk/packages/advi/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/advi/trunk/debian/svn-deblayout 2006-01-04 02:46:54 UTC (rev 2357)
+++ trunk/packages/advi/trunk/debian/svn-deblayout 2006-01-04 04:34:46 UTC (rev 2358)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/advi/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/advi
Copied: trunk/packages/advi/upstream/advi_1.6.0.orig.tar.gz (from rev 2292, trunk/packages/advi/trunk/advi_1.6.0.orig.tar.gz)
More information about the Pkg-ocaml-maint-commits
mailing list