[Pkg-ocaml-maint-commits] r2303 - in
trunk/packages/missinglib/trunk/debian: . patches
Samuel Mimram
smimram at costa.debian.org
Mon Dec 19 20:35:00 UTC 2005
Author: smimram
Date: 2005-12-19 20:34:59 +0000 (Mon, 19 Dec 2005)
New Revision: 2303
Added:
trunk/packages/missinglib/trunk/debian/patches/
trunk/packages/missinglib/trunk/debian/patches/00list
trunk/packages/missinglib/trunk/debian/patches/loc.dpatch
trunk/packages/missinglib/trunk/debian/patches/no_warn-error.dpatch
Modified:
trunk/packages/missinglib/trunk/debian/changelog
trunk/packages/missinglib/trunk/debian/control
trunk/packages/missinglib/trunk/debian/copyright
trunk/packages/missinglib/trunk/debian/rules
Log:
Added patches for the package to compile with OCaml 3.09.
Modified: trunk/packages/missinglib/trunk/debian/changelog
===================================================================
--- trunk/packages/missinglib/trunk/debian/changelog 2005-12-19 20:11:02 UTC (rev 2302)
+++ trunk/packages/missinglib/trunk/debian/changelog 2005-12-19 20:34:59 UTC (rev 2303)
@@ -2,8 +2,12 @@
* Rebuild with OCaml 3.09.0.
* Updated standards version to 3.6.2, no changes needed.
+ * Using dpatch to handle patches.
+ * Added loc.dpatch to handle new loc name with OCaml 3.09.
+ * Added no_warn-error.dpatch to compile with harmless warnings.
+ * Updated FSF's address in copyright.
- -- Samuel Mimram <smimram at debian.org> Sun, 20 Nov 2005 21:36:16 +0100
+ -- Samuel Mimram <smimram at debian.org> Mon, 19 Dec 2005 21:14:13 +0100
missinglib (0.4.10.debian-1) unstable; urgency=medium
Modified: trunk/packages/missinglib/trunk/debian/control
===================================================================
--- trunk/packages/missinglib/trunk/debian/control 2005-12-19 20:11:02 UTC (rev 2302)
+++ trunk/packages/missinglib/trunk/debian/control 2005-12-19 20:34:59 UTC (rev 2303)
@@ -3,7 +3,7 @@
Section: devel
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.0), ocaml-tools (>= 2004.07.26-1), ocaml-findlib (>= 1.0.4-1), libounit-ocaml-dev (>= 1.0.1-2)
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.0), ocaml-tools (>= 2004.07.26-1), ocaml-findlib (>= 1.0.4-1), libounit-ocaml-dev (>= 1.0.1-2), dpatch
Standards-Version: 3.6.2
Package: libmissinglib-ocaml-dev
Modified: trunk/packages/missinglib/trunk/debian/copyright
===================================================================
--- trunk/packages/missinglib/trunk/debian/copyright 2005-12-19 20:11:02 UTC (rev 2302)
+++ trunk/packages/missinglib/trunk/debian/copyright 2005-12-19 20:34:59 UTC (rev 2303)
@@ -19,7 +19,8 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ USA.
The GNU General Public License is available in the file COPYING in the source
distribution. Debian GNU/Linux users may find this in
Added: trunk/packages/missinglib/trunk/debian/patches/00list
===================================================================
--- trunk/packages/missinglib/trunk/debian/patches/00list 2005-12-19 20:11:02 UTC (rev 2302)
+++ trunk/packages/missinglib/trunk/debian/patches/00list 2005-12-19 20:34:59 UTC (rev 2303)
@@ -0,0 +1,2 @@
+loc
+no_warn-error
Added: trunk/packages/missinglib/trunk/debian/patches/loc.dpatch
===================================================================
--- trunk/packages/missinglib/trunk/debian/patches/loc.dpatch 2005-12-19 20:11:02 UTC (rev 2302)
+++ trunk/packages/missinglib/trunk/debian/patches/loc.dpatch 2005-12-19 20:34:59 UTC (rev 2303)
@@ -0,0 +1,245 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## loc.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use new loc name.
+
+ at DPATCH@
+diff -urNad missinglib-0.4.10.debian~/libsrc/camlp4/pa_bparser.ml missinglib-0.4.10.debian/libsrc/camlp4/pa_bparser.ml
+--- missinglib-0.4.10.debian~/libsrc/camlp4/pa_bparser.ml 2004-09-01 01:49:20.000000000 +0200
++++ missinglib-0.4.10.debian/libsrc/camlp4/pa_bparser.ml 2005-12-19 21:27:12.000000000 +0100
+@@ -26,8 +26,8 @@
+ ;
+
+ value strm_n = "strm__";
+-value peek_fun loc = <:expr< Stream.peek >>;
+-value junk_fun loc = <:expr< Stream.junk >>;
++value peek_fun _loc = <:expr< Stream.peek >>;
++value junk_fun _loc = <:expr< Stream.junk >>;
+
+ (* Parsers. *)
+ (* In syntax generated, many cases are optimisations. *)
+@@ -85,7 +85,7 @@
+ ;
+
+ value rec subst v e =
+- let loc = MLast.loc_of_expr e in
++ let _loc = MLast.loc_of_expr e in
+ match e with
+ [ <:expr< $lid:x$ >> ->
+ let x = if x = v then strm_n else x in
+@@ -108,12 +108,12 @@
+
+ value stream_pattern_component skont ckont =
+ fun
+- [ SpTrm loc p wo ->
+- <:expr< match $peek_fun loc$ $lid:strm_n$ with
++ [ SpTrm _loc p wo ->
++ <:expr< match $peek_fun _loc$ $lid:strm_n$ with
+ [ Some $p$ $when:wo$ ->
+- do { $junk_fun loc$ $lid:strm_n$; $skont$ }
++ do { $junk_fun _loc$ $lid:strm_n$; $skont$ }
+ | _ -> $ckont$ ] >>
+- | SpNtr loc p e ->
++ | SpNtr _loc p e ->
+ let e =
+ match e with
+ [ <:expr< fun [ ($lid:v$ : Stream.t _) -> $e$ ] >> when v = strm_n -> e
+@@ -137,7 +137,7 @@
+ <:expr< match try Some $e$ with [ Stream.Failure -> None ] with
+ [ Some $p$ -> $skont$
+ | _ -> $ckont$ ] >>
+- | SpStr loc p ->
++ | SpStr _loc p ->
+ try
+ match p with
+ [ <:patt< $lid:v$ >> -> subst v skont
+@@ -146,7 +146,7 @@
+ [ Not_found -> <:expr< let $p$ = $lid:strm_n$ in $skont$ >> ] ]
+ ;
+
+-value rec stream_pattern loc epo e ekont =
++value rec stream_pattern _loc epo e ekont =
+ fun
+ [ [] ->
+ match epo with
+@@ -162,15 +162,15 @@
+ in
+ <:expr< raise (Stream.Error $str$) >>
+ in
+- stream_pattern loc epo e ekont spcl
++ stream_pattern _loc epo e ekont spcl
+ in
+ let ckont = ekont err in stream_pattern_component skont ckont spc ]
+ ;
+
+-value stream_patterns_term loc ekont tspel =
++value stream_patterns_term _loc ekont tspel =
+ let pel =
+ List.map
+- (fun (p, w, loc, spcl, epo, e) ->
++ (fun (p, w, _loc, spcl, epo, e) ->
+ let p = <:patt< Some $p$ >> in
+ let e =
+ let ekont err =
+@@ -181,37 +181,37 @@
+ in
+ <:expr< raise (Stream.Error $str$) >>
+ in
+- let skont = stream_pattern loc epo e ekont spcl in
+- <:expr< do { $junk_fun loc$ $lid:strm_n$; $skont$ } >>
++ let skont = stream_pattern _loc epo e ekont spcl in
++ <:expr< do { $junk_fun _loc$ $lid:strm_n$; $skont$ } >>
+ in
+ (p, w, e))
+ tspel
+ in
+ let pel = pel @ [(<:patt< _ >>, None, ekont ())] in
+- <:expr< match $peek_fun loc$ $lid:strm_n$ with [ $list:pel$ ] >>
++ <:expr< match $peek_fun _loc$ $lid:strm_n$ with [ $list:pel$ ] >>
+ ;
+
+ value rec group_terms =
+ fun
+- [ [([(SpTrm loc p w, None) :: spcl], epo, e) :: spel] ->
++ [ [([(SpTrm _loc p w, None) :: spcl], epo, e) :: spel] ->
+ let (tspel, spel) = group_terms spel in
+- ([(p, w, loc, spcl, epo, e) :: tspel], spel)
++ ([(p, w, _loc, spcl, epo, e) :: tspel], spel)
+ | spel -> ([], spel) ]
+ ;
+
+-value rec parser_cases loc =
++value rec parser_cases _loc =
+ fun
+ [ [] -> <:expr< raise Stream.Failure >>
+ | spel ->
+ match group_terms spel with
+ [ ([], [(spcl, epo, e) :: spel]) ->
+- stream_pattern loc epo e (fun _ -> parser_cases loc spel) spcl
++ stream_pattern _loc epo e (fun _ -> parser_cases _loc spel) spcl
+ | (tspel, spel) ->
+- stream_patterns_term loc (fun _ -> parser_cases loc spel) tspel ] ]
++ stream_patterns_term _loc (fun _ -> parser_cases _loc spel) tspel ] ]
+ ;
+
+-value cparser loc bpo pc =
+- let e = parser_cases loc pc in
++value cparser _loc bpo pc =
++ let e = parser_cases _loc pc in
+ let e =
+ match bpo with
+ [ Some bp -> <:expr< let $bp$ = Stream.count $lid:strm_n$ in $e$ >>
+@@ -221,11 +221,11 @@
+ <:expr< fun $p$ -> $e$ >>
+ ;
+
+-value b_cparser loc bpo pc =
++value b_cparser _loc bpo pc =
+ let bstrm_n = "bstrm__" in
+ let rec makethefun thelist = match thelist with
+ [ [] -> <:expr< raise Stream.Failure >>
+- | [x::xs] -> let e = cparser loc bpo [x] in
++ | [x::xs] -> let e = cparser _loc bpo [x] in
+ let f = makethefun xs in
+ <:expr< try let cstream = new BNFsupport.lazyStream bstrm__ in
+ let res = ($e$) cstream#to_stream in do { cstream#consume_stream; res } with [Stream.Error _ | Stream.Failure -> $f$] >> ] in
+@@ -234,8 +234,8 @@
+ <:expr< fun $p$ -> $thefun$ >>
+ ;
+
+-value cparser_match loc me bpo pc =
+- let pc = parser_cases loc pc in
++value cparser_match _loc me bpo pc =
++ let pc = parser_cases _loc pc in
+ let e =
+ match bpo with
+ [ Some bp -> <:expr< let $bp$ = Stream.count $lid:strm_n$ in $pc$ >>
+@@ -260,7 +260,7 @@
+ | _ -> False ]
+ ;
+
+-value slazy loc e =
++value slazy _loc e =
+ match e with
+ [ <:expr< $f$ () >> ->
+ match f with
+@@ -271,18 +271,18 @@
+
+ value rec cstream gloc =
+ fun
+- [ [] -> let loc = gloc in <:expr< Stream.sempty >>
+- | [SeTrm loc e] ->
++ [ [] -> let _loc = gloc in <:expr< Stream.sempty >>
++ | [SeTrm _loc e] ->
+ if not_computing e then <:expr< Stream.ising $e$ >>
+- else <:expr< Stream.lsing $slazy loc e$ >>
+- | [SeTrm loc e :: secl] ->
++ else <:expr< Stream.lsing $slazy _loc e$ >>
++ | [SeTrm _loc e :: secl] ->
+ if not_computing e then <:expr< Stream.icons $e$ $cstream gloc secl$ >>
+- else <:expr< Stream.lcons $slazy loc e$ $cstream gloc secl$ >>
+- | [SeNtr loc e] ->
+- if not_computing e then e else <:expr< Stream.slazy $slazy loc e$ >>
+- | [SeNtr loc e :: secl] ->
++ else <:expr< Stream.lcons $slazy _loc e$ $cstream gloc secl$ >>
++ | [SeNtr _loc e] ->
++ if not_computing e then e else <:expr< Stream.slazy $slazy _loc e$ >>
++ | [SeNtr _loc e :: secl] ->
+ if not_computing e then <:expr< Stream.iapp $e$ $cstream gloc secl$ >>
+- else <:expr< Stream.lapp $slazy loc e$ $cstream gloc secl$ >> ]
++ else <:expr< Stream.lapp $slazy _loc e$ $cstream gloc secl$ >> ]
+ ;
+
+ (* Syntax extensions in Ocaml grammar *)
+@@ -291,12 +291,12 @@
+ GLOBAL: expr;
+ expr: LEVEL "expr1"
+ [ [ "parser"; po = OPT ipatt; OPT "|"; pcl = LIST1 parser_case SEP "|" ->
+- <:expr< $cparser loc po pcl$ >>
++ <:expr< $cparser _loc po pcl$ >>
+ | "bparser"; po = OPT ipatt; OPT "|"; pcl = LIST1 parser_case SEP "|" ->
+- <:expr< $b_cparser loc po pcl$ >>
++ <:expr< $b_cparser _loc po pcl$ >>
+ | "match"; e = expr; "with"; "parser"; po = OPT ipatt; OPT "|";
+ pcl = LIST1 parser_case SEP "|" ->
+- <:expr< $cparser_match loc e po pcl$ >> ] ]
++ <:expr< $cparser_match _loc e po pcl$ >> ] ]
+ ;
+ parser_case:
+ [ [ "[<"; sp = stream_patt; ">]"; po = OPT ipatt; "->"; e = expr ->
+@@ -317,9 +317,9 @@
+ ;
+ stream_patt_comp:
+ [ [ "'"; p = patt; eo = OPT [ "when"; e = (expr LEVEL "expr1") -> e ] ->
+- SpTrm loc p eo
+- | p = patt; "="; e = (expr LEVEL "expr1") -> SpNtr loc p e
+- | p = patt -> SpStr loc p ] ]
++ SpTrm _loc p eo
++ | p = patt; "="; e = (expr LEVEL "expr1") -> SpNtr _loc p e
++ | p = patt -> SpStr _loc p ] ]
+ ;
+ stream_patt_comp_err:
+ [ [ spc = stream_patt_comp;
+@@ -331,9 +331,9 @@
+ ;
+
+ expr: LEVEL "simple"
+- [ [ "[<"; ">]" -> <:expr< $cstream loc []$ >>
++ [ [ "[<"; ">]" -> <:expr< $cstream _loc []$ >>
+ | "[<"; sel = stream_expr_comp_list; ">]" ->
+- <:expr< $cstream loc sel$ >> ] ]
++ <:expr< $cstream _loc sel$ >> ] ]
+ ;
+ stream_expr_comp_list:
+ [ [ se = stream_expr_comp; ";"; sel = stream_expr_comp_list -> [se :: sel]
+@@ -341,7 +341,7 @@
+ | se = stream_expr_comp -> [se] ] ]
+ ;
+ stream_expr_comp:
+- [ [ "'"; e = expr LEVEL "expr1" -> SeTrm loc e
+- | e = expr LEVEL "expr1" -> SeNtr loc e ] ]
++ [ [ "'"; e = expr LEVEL "expr1" -> SeTrm _loc e
++ | e = expr LEVEL "expr1" -> SeNtr _loc e ] ]
+ ;
+ END;
Property changes on: trunk/packages/missinglib/trunk/debian/patches/loc.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/missinglib/trunk/debian/patches/no_warn-error.dpatch
===================================================================
--- trunk/packages/missinglib/trunk/debian/patches/no_warn-error.dpatch 2005-12-19 20:11:02 UTC (rev 2302)
+++ trunk/packages/missinglib/trunk/debian/patches/no_warn-error.dpatch 2005-12-19 20:34:59 UTC (rev 2303)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no_warn-error.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Warnings should be harmless.
+
+ at DPATCH@
+diff -urNad missinglib-0.4.10.debian~/Makefile.setup missinglib-0.4.10.debian/Makefile.setup
+--- missinglib-0.4.10.debian~/Makefile.setup 2004-07-21 22:56:13.000000000 +0200
++++ missinglib-0.4.10.debian/Makefile.setup 2005-12-19 21:27:57.000000000 +0100
+@@ -16,7 +16,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ #
+
+-OCAMLFLAGS := -warn-error A
++OCAMLFLAGS :=
+
+ ifndef OCAMLMAKEFILE
+ OCAMLMAKEFILE := $(PATHTOTOP)/contrib/OCamlMakefile/OCamlMakefile
Property changes on: trunk/packages/missinglib/trunk/debian/patches/no_warn-error.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/missinglib/trunk/debian/rules
===================================================================
--- trunk/packages/missinglib/trunk/debian/rules 2005-12-19 20:11:02 UTC (rev 2302)
+++ trunk/packages/missinglib/trunk/debian/rules 2005-12-19 20:34:59 UTC (rev 2303)
@@ -6,6 +6,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+# We want to use dpatch
+include /usr/share/dpatch/dpatch.make
+
OCAMLABI := $(shell ocamlc -version)
DESTDIR = $(CURDIR)/debian/libmissinglib-ocaml-dev/$(shell ocamlc -where)
@@ -30,7 +33,7 @@
touch configure-stamp
-build: build-stamp
+build: patch-stamp build-stamp
build-stamp: configure-stamp
dh_testdir
@@ -40,7 +43,7 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
More information about the Pkg-ocaml-maint-commits
mailing list