[Pkg-ocaml-maint-commits] r2360 -
trunk/packages/advi/trunk/debian/patches
Julien Cristau
jcristau-guest at costa.debian.org
Wed Jan 4 05:14:52 UTC 2006
Author: jcristau-guest
Date: 2006-01-04 05:14:51 +0000 (Wed, 04 Jan 2006)
New Revision: 2360
Modified:
trunk/packages/advi/trunk/debian/patches/fix_unused_variables.dpatch
Log:
Modify the patch a bit, to make it apply to 1.6.0.
Modified: trunk/packages/advi/trunk/debian/patches/fix_unused_variables.dpatch
===================================================================
--- trunk/packages/advi/trunk/debian/patches/fix_unused_variables.dpatch 2006-01-04 04:56:22 UTC (rev 2359)
+++ trunk/packages/advi/trunk/debian/patches/fix_unused_variables.dpatch 2006-01-04 05:14:51 UTC (rev 2360)
@@ -7,14 +7,8 @@
@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
+--- advi/addons.ml 10 Oct 2003 12:45:27 -0000 1.9
++++ advi/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. *)
@@ -42,23 +36,8 @@
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;;
-
+--- advi/driver.ml 17 Oct 2004 20:33:35 -0000 1.146
++++ advi/driver.ml 7 Dec 2004 20:48:03 -0000 1.147
@@ -437,7 +437,7 @@
| "color" :: "pop" :: [] ->
color_pop st
@@ -77,15 +56,6 @@
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
@@ -95,23 +65,8 @@
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"
+--- advi/dviview.ml 17 Oct 2004 20:33:35 -0000 1.155
++++ advi/dviview.ml 7 Dec 2004 20:48:03 -0000 1.156
@@ -320,9 +320,7 @@
| In f -> float attr.geom.Ageometry.height /. (h_in +. 2.0 *. f)
| _ -> assert false in
@@ -178,14 +133,8 @@
()
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
+--- advi/grdev.ml 3 Sep 2004 15:08:55 -0000 1.161
++++ advi/grdev.ml 7 Dec 2004 20:48:03 -0000 1.162
@@ -15,7 +15,7 @@
(* Based on Mldvi by Alexandre Miquel. *)
(***********************************************************************)
@@ -224,23 +173,8 @@
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;;
-
+--- advi/gs.ml 7 Oct 2004 22:27:58 -0000 1.42
++++ advi/gs.ml 7 Dec 2004 20:48:03 -0000 1.43
@@ -63,7 +63,6 @@
let parse_pos s =
@@ -264,14 +198,8 @@
;;
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
+--- advi/gterm.ml 9 Oct 2003 14:10:45 -0000 1.18
++++ advi/gterm.ml 7 Dec 2004 20:48:03 -0000 1.19
@@ -15,7 +15,7 @@
(* Based on Mldvi by Alexandre Miquel. *)
(***********************************************************************)
@@ -300,14 +228,8 @@
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
+--- advi/laser_pointer.ml 15 Sep 2004 16:37:55 -0000 1.7
++++ advi/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. *)
@@ -326,14 +248,8 @@
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
+--- advi/misc.ml 11 Aug 2004 22:08:06 -0000 1.35
++++ advi/misc.ml 7 Dec 2004 20:48:03 -0000 1.36
@@ -15,7 +15,7 @@
(* Based on Mldvi by Alexandre Miquel. *)
(***********************************************************************)
@@ -368,14 +284,8 @@
| _ -> 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
+--- advi/symbol.ml 1 Oct 2004 11:13:35 -0000 1.36
++++ advi/symbol.ml 7 Dec 2004 20:48:03 -0000 1.37
@@ -15,7 +15,7 @@
(* Based on Mldvi by Alexandre Miquel. *)
(***********************************************************************)
@@ -401,14 +311,8 @@
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
+--- advi/ttfont.ml 6 Jan 2003 10:49:14 -0000 1.2
++++ advi/ttfont.ml 7 Dec 2004 20:48:03 -0000 1.3
@@ -15,7 +15,7 @@
(* Based on Mldvi by Alexandre Miquel. *)
(***********************************************************************)
More information about the Pkg-ocaml-maint-commits
mailing list