The following commit has been merged in the master branch:
commit 2210f20b96c06a5b252e5048d021849b9c7973d0
Author: Stephane Glondu <st...@glondu.net>
Date:   Tue Jul 23 10:21:48 2013 +0200

    Remove obsolete patch

diff --git a/debian/patches/0001-Upstream-s-official-patch-6.08-1.patch 
b/debian/patches/0001-Upstream-s-official-patch-6.08-1.patch
deleted file mode 100644
index 3b096e9..0000000
--- a/debian/patches/0001-Upstream-s-official-patch-6.08-1.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From: Stephane Glondu <st...@glondu.net>
-Date: Wed, 8 May 2013 13:03:59 +0200
-Subject: Upstream's official patch-6.08-1
-
-Origin: upstream, http://pauillac.inria.fr/~ddr/camlp5/distrib/src/patch-6.08-1
----
- LICENSE                                  |    2 +-
- main/pcaml.ml                            |    4 ++--
- ocaml_stuff/4.01.0/parsing/asttypes.mli  |    2 --
- ocaml_stuff/4.01.0/parsing/location.mli  |    3 ---
- ocaml_stuff/4.01.0/parsing/longident.mli |    2 --
- ocaml_stuff/4.01.0/parsing/parsetree.mli |   33 +++++++++++++++---------------
- ocaml_stuff/4.01.0/utils/warnings.mli    |   10 +++++----
- 7 files changed, 25 insertions(+), 31 deletions(-)
-
-diff --git a/LICENSE b/LICENSE
-index 06fb1d3..d85e9d0 100644
---- a/LICENSE
-+++ b/LICENSE
-@@ -1,4 +1,4 @@
--* Copyright (c) 2007-2012, INRIA (Institut National de Recherches en
-+* Copyright (c) 2007-2013, INRIA (Institut National de Recherches en
- * Informatique et Automatique). All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
-diff --git a/main/pcaml.ml b/main/pcaml.ml
-index c586ef6..487444b 100644
---- a/main/pcaml.ml
-+++ b/main/pcaml.ml
-@@ -1,5 +1,5 @@
- (* camlp5r *)
--(* $Id: pcaml.ml,v 6.36 2013-03-06 09:34:30 deraugla Exp $ *)
-+(* $Id: pcaml.ml,v 6.37 2013-03-06 16:35:10 deraugla Exp $ *)
- (* Copyright (c) INRIA 2007-2012 *)
- 
- #load "pa_macro.cmo";
-@@ -7,7 +7,7 @@
- 
- open Printf;
- 
--value version = "6.08";
-+value version = "6.09-exp";
- value syntax_name = ref "";
- 
- value gram =
-diff --git a/ocaml_stuff/4.01.0/parsing/asttypes.mli 
b/ocaml_stuff/4.01.0/parsing/asttypes.mli
-index 83b372e..fb6d5ba 100644
---- a/ocaml_stuff/4.01.0/parsing/asttypes.mli
-+++ b/ocaml_stuff/4.01.0/parsing/asttypes.mli
-@@ -10,8 +10,6 @@
- (*                                                                     *)
- (***********************************************************************)
- 
--(* Id *)
--
- (* Auxiliary a.s.t. types used by parsetree and typedtree. *)
- 
- type constant =
-diff --git a/ocaml_stuff/4.01.0/parsing/location.mli 
b/ocaml_stuff/4.01.0/parsing/location.mli
-index 21d17ff..bae9090 100644
---- a/ocaml_stuff/4.01.0/parsing/location.mli
-+++ b/ocaml_stuff/4.01.0/parsing/location.mli
-@@ -10,8 +10,6 @@
- (*                                                                     *)
- (***********************************************************************)
- 
--(* Id *)
--
- (* Source code locations (ranges of positions), used in parsetree. *)
- 
- open Format
-@@ -77,4 +75,3 @@ val show_filename: string -> string
- 
- 
- val absname: bool ref
--
-diff --git a/ocaml_stuff/4.01.0/parsing/longident.mli 
b/ocaml_stuff/4.01.0/parsing/longident.mli
-index 9f971e8..9e79585 100644
---- a/ocaml_stuff/4.01.0/parsing/longident.mli
-+++ b/ocaml_stuff/4.01.0/parsing/longident.mli
-@@ -10,8 +10,6 @@
- (*                                                                     *)
- (***********************************************************************)
- 
--(* Id *)
--
- (* Long identifiers, used in parsetree. *)
- 
- type t =
-diff --git a/ocaml_stuff/4.01.0/parsing/parsetree.mli 
b/ocaml_stuff/4.01.0/parsing/parsetree.mli
-index d4720a9..b802fc8 100644
---- a/ocaml_stuff/4.01.0/parsing/parsetree.mli
-+++ b/ocaml_stuff/4.01.0/parsing/parsetree.mli
-@@ -10,8 +10,6 @@
- (*                                                                     *)
- (***********************************************************************)
- 
--(* Id *)
--
- (* Abstract syntax tree produced by parsing *)
- 
- open Asttypes
-@@ -104,7 +102,8 @@ and expression_desc =
-   | Pexp_ifthenelse of expression * expression * expression option
-   | Pexp_sequence of expression * expression
-   | Pexp_while of expression * expression
--  | Pexp_for of string loc *  expression * expression * direction_flag * 
expression
-+  | Pexp_for of
-+      string loc *  expression * expression * direction_flag * expression
-   | Pexp_constraint of expression * core_type option * core_type option
-   | Pexp_when of expression * expression
-   | Pexp_send of expression * string
-@@ -126,7 +125,7 @@ and expression_desc =
- and value_description =
-   { pval_type: core_type;
-     pval_prim: string list;
--    pval_loc : Location.t
-+    pval_loc: Location.t
-     }
- 
- (* Type declarations *)
-@@ -161,14 +160,14 @@ and class_type_desc =
-   | Pcty_fun of label * core_type * class_type
- 
- and class_signature = {
--    pcsig_self : core_type;
--    pcsig_fields : class_type_field list;
--    pcsig_loc : Location.t;
-+    pcsig_self: core_type;
-+    pcsig_fields: class_type_field list;
-+    pcsig_loc: Location.t;
-   }
- 
- and class_type_field = {
--    pctf_desc : class_type_field_desc;
--    pctf_loc : Location.t;
-+    pctf_desc: class_type_field_desc;
-+    pctf_loc: Location.t;
-   }
- 
- and class_type_field_desc =
-@@ -197,23 +196,23 @@ and class_expr_desc =
-   | Pcl_constraint of class_expr * class_type
- 
- and class_structure = {
--    pcstr_pat : pattern;
--    pcstr_fields :  class_field list;
-+    pcstr_pat: pattern;
-+    pcstr_fields: class_field list;
-   }
- 
- and class_field = {
--    pcf_desc : class_field_desc;
--    pcf_loc : Location.t;
-+    pcf_desc: class_field_desc;
-+    pcf_loc: Location.t;
-   }
- 
- and class_field_desc =
-     Pcf_inher of override_flag * class_expr * string option
-   | Pcf_valvirt of (string loc * mutable_flag * core_type)
-   | Pcf_val of (string loc * mutable_flag * override_flag * expression)
--  | Pcf_virt  of (string loc * private_flag * core_type)
--  | Pcf_meth of (string loc * private_flag *override_flag * expression)
--  | Pcf_constr  of (core_type * core_type)
--  | Pcf_init  of expression
-+  | Pcf_virt of (string loc * private_flag * core_type)
-+  | Pcf_meth of (string loc * private_flag * override_flag * expression)
-+  | Pcf_constr of (core_type * core_type)
-+  | Pcf_init of expression
- 
- and class_declaration = class_expr class_infos
- 
-diff --git a/ocaml_stuff/4.01.0/utils/warnings.mli 
b/ocaml_stuff/4.01.0/utils/warnings.mli
-index 943e3c0..dd3a5ec 100644
---- a/ocaml_stuff/4.01.0/utils/warnings.mli
-+++ b/ocaml_stuff/4.01.0/utils/warnings.mli
-@@ -10,8 +10,6 @@
- (*                                                                     *)
- (***********************************************************************)
- 
--(* Id *)
--
- open Format
- 
- type t =
-@@ -44,16 +42,20 @@ type t =
-   | Unused_var_strict of string             (* 27 *)
-   | Wildcard_arg_to_constant_constr         (* 28 *)
-   | Eol_in_string                           (* 29 *)
--  | Duplicate_definitions of string * string * string * string (*30 *)
-+  | Duplicate_definitions of string * string * string * string (* 30 *)
-   | Multiple_definition of string * string * string (* 31 *)
-   | Unused_value_declaration of string      (* 32 *)
-   | Unused_open of string                   (* 33 *)
-   | Unused_type_declaration of string       (* 34 *)
-   | Unused_for_index of string              (* 35 *)
-   | Unused_ancestor of string               (* 36 *)
--  | Unused_constructor of string * bool * bool  (* 37 *)
-+  | Unused_constructor of string * bool * bool (* 37 *)
-   | Unused_exception of string * bool       (* 38 *)
-   | Unused_rec_flag                         (* 39 *)
-+  | Name_out_of_scope of string list * bool (* 40 *)
-+  | Ambiguous_name of string list * bool    (* 41 *)
-+  | Disambiguated_name of string            (* 42 *)
-+  | Nonoptional_label of string             (* 43 *)
- ;;
- 
- val parse_options : bool -> string -> unit;;
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ef8a5b1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Upstream-s-official-patch-6.08-1.patch

-- 
camlp5 packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to