This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository ocamlgsl.
commit 6fe5baf3322220ef1e036dcb92590eeb99d3700d Author: Mehdi Dogguy <me...@debian.org> Date: Sun Jan 17 15:40:15 2016 +0100 Remove patches, not needed anymore --- debian/patches/02_correct_examples | 39 ----------------- debian/patches/cdf_handle_int_arguments | 63 ---------------------------- debian/patches/make_bytecode | 74 --------------------------------- debian/patches/match_gcc_4_2 | 19 --------- debian/patches/series | 3 -- 5 files changed, 198 deletions(-) diff --git a/debian/patches/02_correct_examples b/debian/patches/02_correct_examples deleted file mode 100755 index 02f6d19..0000000 --- a/debian/patches/02_correct_examples +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -e -## 02_correct_examples.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -lt 1 ]; then - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}" - -case "$1" in - -patch) patch -p1 ${patch_opts} < $0;; - -unpatch) patch -R -p1 ${patch_opts} < $0;; - *) - echo "`basename $0`: script expects -patch|-unpatch as argument" >&2 - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad /mnt/nfs0/gildor/deb/ocaml-package/ocamlgsl/ocamlgsl-0.3.3/examples/Makefile ocamlgsl-0.3.3/examples/Makefile ---- /mnt/nfs0/gildor/deb/ocaml-package/ocamlgsl/ocamlgsl-0.3.3/examples/Makefile 2002-12-30 20:53:22.000000000 +0100 -+++ ocamlgsl-0.3.3/examples/Makefile 2004-05-22 00:26:39.000000000 +0200 -@@ -1,7 +1,7 @@ - --OCAMLC := ocamlc.opt --OCAMLOPT := ocamlopt.opt --CAMLP4O := camlp4o.opt -+OCAMLC := ocamlc -+OCAMLOPT := ocamlopt -+CAMLP4O := camlp4o - - OCAMLBCFLAGS := -g - OCAMLNCFLAGS := -unsafe diff --git a/debian/patches/cdf_handle_int_arguments b/debian/patches/cdf_handle_int_arguments deleted file mode 100755 index a69a0a4..0000000 --- a/debian/patches/cdf_handle_int_arguments +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## cdf_handle_int_arguments.dpatch by <julien.cris...@ens-lyon.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: gsl_cdf.h contains functions with const unsigned int arguments, so we -## DP: can handle them as well as const double. - -@DPATCH@ - ---- ocamlgsl-0.4.0.orig/do_cdf.ml 2005-01-05 00:05:03.000000000 +0100 -+++ ocamlgsl-0.4.0/do_cdf.ml 2006-04-21 03:00:13.000000000 +0200 -@@ -1,7 +1,10 @@ -+type arg_type = Double of string | Int of string - - let parse = - let regexp_full = Str.regexp "double gsl_cdf_\\([^ ]+\\) (\\([^)]+\\));" in -- let regexp_arg = Str.regexp "const double \\([a-zA-Z0-9_]+\\)" in -+ let regexp_arg = Str.regexp "const" in -+ let regexp_double = Str.regexp "const double \\([a-zA-Z0-9_]+\\)" in -+ let regexp_uint = Str.regexp "const unsigned int \\([a-zA-z0-9_]+\\)" in - fun s -> - if Str.string_match regexp_full s 0 - then -@@ -11,8 +14,11 @@ - let acc = ref [] in - let i = ref (Str.group_beginning 2) in - begin try while true do -- let _ = Str.search_forward regexp_arg s !i in -- acc := (Str.matched_group 1 s) :: !acc ; -+ let j = Str.search_forward regexp_arg s !i in -+ if Str.string_match regexp_double s j then -+ acc := (Double (Str.matched_group 1 s)) :: !acc -+ else if Str.string_match regexp_uint s j then -+ acc := (Int (Str.matched_group 1 s)) :: !acc; - i := Str.match_end () - done - with Not_found -> () end ; -@@ -26,14 +32,23 @@ - | None -> () - | Some v -> f v - -+ -+let trans_ml = function -+ Double s -> (String.lowercase s) ^ ":float" -+ | Int s -> (String.lowercase s) ^ ":int" -+ -+let trans_c = function -+ Double _ -> print_string "Double_val, " -+ | Int _ -> print_string "Int_val, " -+ - let print_ml (fun_name, args) = - Printf.printf "external %s : " fun_name ; -- List.iter (fun arg -> Printf.printf "%s:float -> " (String.lowercase arg)) args ; -+ List.iter (fun arg -> Printf.printf "%s -> " (trans_ml arg)) args ; - Printf.printf "float = \"ml_gsl_cdf_%s\" \"gsl_cdf_%s\" \"float\"\n" fun_name fun_name - - let print_c (fun_name, args) = - Printf.printf "ML%d(gsl_cdf_%s, " (List.length args) fun_name ; -- List.iter (fun arg -> print_string "Double_val, ") args ; -+ List.iter trans_c args ; - print_string "copy_double)\n" ; - print_newline () - diff --git a/debian/patches/make_bytecode b/debian/patches/make_bytecode deleted file mode 100755 index 6d5254c..0000000 --- a/debian/patches/make_bytecode +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -e -## make_bytecode.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch}" - -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - -@DPATCH@ -diff -urNad ocamlgsl~/Makefile ocamlgsl/Makefile ---- ocamlgsl~/Makefile 2010-04-20 21:56:43.000000000 +0200 -+++ ocamlgsl/Makefile 2010-04-20 21:57:44.297632550 +0200 -@@ -119,8 +119,10 @@ - $(wildcard test/*.ml) $(wildcard ocamlgsl.info*) - VERSION := 0.6.0 - --all : stubs gsl.cma gsl.cmxa $(CMI) -- -+all : all-opt -+all-byte : stubs gsl.cma $(CMI) -+all-opt : all-byte gsl.cmxa -+ - STUBS = libmlgsl.$(A) - ifdef DYNAMIC_LINKING - STUBS += dllmlgsl.$(D) -@@ -147,20 +149,27 @@ - top : libmlgsl.$(A) gsl.cma - ocamlmktop -I . -o ocamlgsl$(EXE) bigarray.cma gsl.cma - --install : all -+install : install-opt -+install-opt : all-opt -+ $(MAKE) install-byte -+install-byte : all-byte - mkdir -p $(DESTDIR)$(INSTALLDIR) -- cp $(STUBS) gsl.cma gsl.cmxa gsl.$(A) \ -- $(CMI) $(MLOPTOBJ) $(DESTDIR)$(INSTALLDIR) -+ cp $(STUBS) gsl.cma $(wildcard gsl.cmxa) $(wildcard gsl.$(A)) \ -+ $(CMI) $(wildcard $(MLOPTOBJ)) $(DESTDIR)$(INSTALLDIR) - mkdir -p $(DESTDIR)$(OCAMLDIR)/stublibs - if test -w $(DESTDIR)$(OCAMLDIR)/stublibs ; then \ - ln -sf $(INSTALLDIR)/dllmlgsl.$(D) $(DESTDIR)$(OCAMLDIR)/stublibs ; fi - --install-findlib : all -+install-findlib: install-findlib-opt -+install-findlib-opt : all-opt -+ $(MAKE) install-findlib-byte -+install-findlib-byte : all-byte - export FINDLIBDIR=$$($(OCAMLFIND) printconf destdir) ; \ - test -d "$${FINDLIBDIR}/stublibs" && mkdir -p $(DESTDIR)$${FINDLIBDIR}/stublibs ; \ - OCAMLFIND_DESTDIR=$(DESTDIR)$${FINDLIBDIR} \ - $(OCAMLFIND) install gsl META \ -- libmlgsl.$(A) dllmlgsl.$(D) gsl.cma gsl.cmxa gsl.$(A) $(CMI) $(MLOPTOBJ) -+ libmlgsl.$(A) dllmlgsl.$(D) gsl.cma $(wildcard gsl.cmxa) $(wildcard gsl.$(A)) \ -+ $(CMI) $(wildcard $(MLOPTOBJ)) - - ocamlgsl.odoc : $(MLOBJ) $(CMI) - $(OCAMLDOC) -v -dump $@ $(filter-out gsl_misc.%, $(filter %.mli, $(SRC))) diff --git a/debian/patches/match_gcc_4_2 b/debian/patches/match_gcc_4_2 deleted file mode 100755 index 378cb18..0000000 --- a/debian/patches/match_gcc_4_2 +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## match_gcc_4_2.dpatch by Sylvain Le Gall <gil...@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@DPATCH@ -diff -urNad ocamlgsl-0.6.0~/Makefile ocamlgsl-0.6.0/Makefile ---- ocamlgsl-0.6.0~/Makefile 2008-05-26 12:12:17.000000000 +0200 -+++ ocamlgsl-0.6.0/Makefile 2008-05-26 12:12:26.000000000 +0200 -@@ -21,7 +21,7 @@ - OCAML_BACKEND := mingw - endif - --OCAML_BACKEND ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) "NR==1 { print \$$2 }") -+OCAML_BACKEND ?= $(shell $(OCAMLC) -verbose foo.c 2>&1 | $(AWK) "NR==1 && /\+ gcc-.*/ { print \"gcc\"; next; } NR==1 { print \$$2 }") - OCAML_VERSION ?= $(shell $(OCAMLC) -version) - - OCAMLBCFLAGS := -g diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 3db681f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -make_bytecode -02_correct_examples -match_gcc_4_2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocamlgsl.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