This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository coinst.

commit 87f8f00940407755e2ea21bdd07472623b0ff13a
Author: Mehdi Dogguy <me...@debian.org>
Date:   Wed Feb 10 19:22:34 2016 +0100

    Remove all patches, integrated upstream.
---
 debian/changelog                |  1 +
 debian/patches/make_byte        | 48 -----------------------------------------
 debian/patches/make_clean       | 27 -----------------------
 debian/patches/make_viewer_byte | 37 -------------------------------
 debian/patches/ocaml_4.02.3     | 45 --------------------------------------
 debian/patches/series           |  4 ----
 6 files changed, 1 insertion(+), 161 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fcbd8f..f0205cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ coinst (1.9.2-1) UNRELEASED; urgency=medium
       (Closes: #759474)
     - Use http.debian.net and allow user to specify source mirror by
       passing --source flag (Closes: #736910)
+  * Remove all patches, integrated upstream.
 
  -- Mehdi Dogguy <me...@debian.org>  Wed, 10 Feb 2016 18:58:01 +0100
 
diff --git a/debian/patches/make_byte b/debian/patches/make_byte
deleted file mode 100644
index 2855496..0000000
--- a/debian/patches/make_byte
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -18,25 +18,43 @@
-        repository.cmx quotient.cmx conflicts.cmx graph.cmx coinst_common.cmx
- COMPFLAGS=-package unix,str,bigarray,cudf -g -I viewer
- OPTLINKFLAGS=$(COMPFLAGS) -linkpkg
-+BYTELINKFLAGS=$(OPTLINKFLAGS) -dllib -lbytearray_stubs -cclib 
-lbytearray_stubs -dllib -ltask_stubs -cclib -ltask_stubs
- 
- OCAMLDEP=ocamlfind ocamldep
- DEPFLAGS = -package js_of_ocaml,js_of_ocaml.syntax -syntax camlp4o -I viewer
- 
- all: $(COINST) $(UPGRADE) $(TRANS)
-+opt: all
-+byte: dllbytearray_stubs.so dlltask_stubs.so $(COINST).byte $(UPGRADE).byte 
$(TRANS).byte
-+
-+dllbytearray_stubs.so: bytearray_stubs.o
-+      ocamlmklib -o bytearray_stubs $^
-+
-+dlltask_stubs.so: task_stubs.o
-+      ocamlmklib -o task_stubs $^
- 
- $(COINST): $(OBJS) cudf_lib.cmx coinst_json.cmx coinst.cmx
-       $(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
- 
--$(COINST).byte: $(OBJS:.cmx=.cmo) cudf_lib.cmo coinst.cmo
--      $(OCAMLC) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
-+$(COINST).byte: $(OBJS:.cmx=.cmo) cudf_lib.cmo coinst_json.cmo coinst.cmo
-+      $(OCAMLC) -o $@  $(BYTELINKFLAGS) $^ $(LINKFLAGS)
-+      cp $@ $(COINST)
- 
- 
- $(UPGRADE): $(OBJS) $(TASK) $(SVG) upgrade_common.cmx upgrade.cmx 
upgrade_main.cmx
-       $(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
- 
-+$(UPGRADE).byte: $(OBJS:.cmx=.cmo) $(TASK:.cmx=.cmo) $(SVG:.cmx=.cmo)  
upgrade_common.cmo upgrade.cmo upgrade_main.cmo
-+      $(OCAMLC) -o $@  $(BYTELINKFLAGS) $^ $(LINKFLAGS)
-+      cp $@ $(UPGRADE)
-+
- $(TRANS): $(OBJS) $(TASK) $(SVG) update_data.cmx upgrade_common.cmx 
upgrade.cmx horn.cmx transition.cmx
-       $(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
- 
-+$(TRANS).byte: $(OBJS:.cmx=.cmo) $(TASK:.cmx=.cmo) $(SVG:.cmx=.cmo) 
update_data.cmo upgrade_common.cmo upgrade.cmo horn.cmo transition.cmo
-+      $(OCAMLC) -o $@  $(BYTELINKFLAGS) $^ $(LINKFLAGS)
-+      cp $@ $(TRANS)
-+
- clean::
-       rm -f $(COINST) $(UPGRADE) $(TRANS) $(COINST).byte $(UPGRADE).byte 
$(TRANS).byte
- 
diff --git a/debian/patches/make_clean b/debian/patches/make_clean
deleted file mode 100644
index 3487e60..0000000
--- a/debian/patches/make_clean
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Ralf Treinen <trei...@debian.org>
-Description: remove all generated files in clean target
-
---- a/viewer/Makefile
-+++ b/viewer/Makefile
-@@ -38,8 +38,9 @@
-       rm -f dot_parser.ml dot_parser.mli dot_lexer.ml
- 
- clean::
--      rm -f coinst_converter coinst_viewer
-+      rm -f coinst_converter coinst_viewer coinst_viewer.byte
-       rm -f jsviewer.js jsviewer.byte
-+      rm -f dot_lexer.ml dot_parser.ml
- 
- #####
- 
---- a/Makefile
-+++ b/Makefile
-@@ -38,7 +38,7 @@
-       $(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^ $(LINKFLAGS)
- 
- clean::
--      rm -f $(COINST) $(UPGRADE) $(TRANS)
-+      rm -f $(COINST) $(UPGRADE) $(TRANS) $(COINST).byte $(UPGRADE).byte 
$(TRANS).byte
- 
- #####
- 
diff --git a/debian/patches/make_viewer_byte b/debian/patches/make_viewer_byte
deleted file mode 100644
index e4c3070..0000000
--- a/debian/patches/make_viewer_byte
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Ralf Treinen <trei...@debian.org>
-Description: add target for building viewer in bytecode
-Debian-bug:  #656730
-
---- a/viewer/Makefile
-+++ b/viewer/Makefile
-@@ -21,13 +21,21 @@
- LINKFLAGS=-package js_of_ocaml -linkpkg
- 
- all: coinst_viewer jsviewer.js coinst_converter
-+opt: all
-+byte: coinst_viewer.byte jsviewer.js coinst_converter.byte
- 
- coinst_viewer: $(OBJS)
-       $(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^
- 
-+coinst_viewer.byte: $(OBJS:.cmx=.cmo)
-+      $(OCAMLC) -o $@  $(OPTLINKFLAGS) $^
-+
- coinst_converter: $(CONVERTER)
-       $(OCAMLOPT) -o $@  $(OPTLINKFLAGS) $^
- 
-+coinst_converter.byte: $(CONVERTER:.cmx=.cmo)
-+      $(OCAMLC) -o $@  $(OPTLINKFLAGS) $^
-+
- jsviewer.js: jsviewer.byte
-       js_of_ocaml $^ -pretty
- 
-@@ -38,7 +46,7 @@
-       rm -f dot_parser.ml dot_parser.mli dot_lexer.ml
- 
- clean::
--      rm -f coinst_converter coinst_viewer coinst_viewer.byte
-+      rm -f coinst_converter coinst_viewer coinst_viewer.byte 
coinst_converter.byte
-       rm -f jsviewer.js jsviewer.byte
-       rm -f dot_lexer.ml dot_parser.ml
- 
diff --git a/debian/patches/ocaml_4.02.3 b/debian/patches/ocaml_4.02.3
deleted file mode 100644
index ba48ad8..0000000
--- a/debian/patches/ocaml_4.02.3
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/ptset.ml
-+++ b/ptset.ml
-@@ -125,6 +125,9 @@
-   in
-   ins t
- 
-+let of_list =
-+  List.fold_left (fun t e -> add e t) Empty
-+
- (*s The code to remove an element is basically similar to the code of
-     insertion. But since we have to maintain the invariant that both
-     subtrees of a [Branch] node are non-empty, we use here the 
-@@ -441,7 +444,10 @@
-           join (k, Leaf k, p, t)
-     in
-     ins t
--      
-+
-+  let of_list =
-+    List.fold_left (fun t e -> add e t) Empty
-+
-   let remove k t =
-     let rec rmv = function
-       | Empty -> Empty
-@@ -606,6 +612,9 @@
- 
-   let add x s = if x < 0 then invalid_arg "BigPos.add"; add x s
- 
-+  let of_list =
-+    List.fold_left (fun t e -> add e t) Empty
-+
-   (* Patricia trees are now binary search trees! *)
- 
-   let rec mem k = function
---- a/ptset.mli
-+++ b/ptset.mli
-@@ -36,6 +36,8 @@
- 
- val add : int -> t -> t
- 
-+val of_list : elt list -> t
-+
- val singleton : int -> t
- 
- val remove : int -> t -> t
diff --git a/debian/patches/series b/debian/patches/series
index be46949..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +0,0 @@
-make_clean
-make_viewer_byte
-make_byte
-ocaml_4.02.3

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/coinst.git

_______________________________________________
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