diff -Nru pcre-ocaml-7.4.3/CHANGES.md pcre-ocaml-7.4.6/CHANGES.md --- pcre-ocaml-7.4.3/CHANGES.md 2019-10-27 21:30:56.000000000 +0000 +++ pcre-ocaml-7.4.6/CHANGES.md 2020-08-04 17:34:21.000000000 +0000 @@ -1,3 +1,21 @@ +### 7.4.6 (2020-08-04) + + * Removed mistakenly kept base library configuration dependency. + + +### 7.4.5 (2020-08-04) + + * Removed excessive build dependency on `base` package. + + +### 7.4.4 (2020-07-30) + + * Added missing dune-configurator dependency. + + * Added support for const char strings in stubs due to stricter handling + in newer OCaml runtimes. This eliminates C-compiler warnings. + + ### 7.4.3 (2019-10-27) * Switched from `caml_alloc_custom` to `caml_alloc_custom_mem`. diff -Nru pcre-ocaml-7.4.3/debian/changelog pcre-ocaml-7.4.6/debian/changelog --- pcre-ocaml-7.4.3/debian/changelog 2020-01-29 08:23:17.000000000 +0000 +++ pcre-ocaml-7.4.6/debian/changelog 2020-08-20 06:32:24.000000000 +0000 @@ -1,3 +1,10 @@ +pcre-ocaml (7.4.6-1) unstable; urgency=medium + + * New upstream release + * Bump debhelper compat level to 13 + + -- Stéphane Glondu Thu, 20 Aug 2020 08:32:24 +0200 + pcre-ocaml (7.4.3-1) unstable; urgency=medium * New upstream release diff -Nru pcre-ocaml-7.4.3/debian/control pcre-ocaml-7.4.6/debian/control --- pcre-ocaml-7.4.3/debian/control 2020-01-29 08:23:17.000000000 +0000 +++ pcre-ocaml-7.4.6/debian/control 2020-08-20 06:32:24.000000000 +0000 @@ -4,12 +4,11 @@ Maintainer: Debian OCaml Maintainers Uploaders: Stéphane Glondu Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), libpcre3-dev, ocaml-nox, ocaml-dune, libdune-ocaml-dev, - libbase-ocaml-dev, dh-ocaml Standards-Version: 4.5.0 Rules-Requires-Root: no diff -Nru pcre-ocaml-7.4.3/debian/rules pcre-ocaml-7.4.6/debian/rules --- pcre-ocaml-7.4.3/debian/rules 2020-01-29 08:23:17.000000000 +0000 +++ pcre-ocaml-7.4.6/debian/rules 2020-08-20 06:32:24.000000000 +0000 @@ -22,6 +22,3 @@ override_dh_auto_install: dune install --destdir=$(DESTDIR) --prefix=/usr --libdir=..$(OCAML_STDLIB_DIR) rm -f $(DESTDIR)/usr/doc/pcre/LICENSE.md - -override_dh_missing: - dh_missing --fail-missing diff -Nru pcre-ocaml-7.4.3/dune-project pcre-ocaml-7.4.6/dune-project --- pcre-ocaml-7.4.3/dune-project 2019-10-27 21:30:56.000000000 +0000 +++ pcre-ocaml-7.4.6/dune-project 2020-08-04 17:34:21.000000000 +0000 @@ -20,8 +20,8 @@ (depends (ocaml (>= 4.08)) (dune (>= 1.10)) + dune-configurator (conf-libpcre :build) - (base :build) base-bytes ) ) diff -Nru pcre-ocaml-7.4.3/pcre.opam pcre-ocaml-7.4.6/pcre.opam --- pcre-ocaml-7.4.3/pcre.opam 2019-10-27 21:30:56.000000000 +0000 +++ pcre-ocaml-7.4.6/pcre.opam 2020-08-04 17:34:21.000000000 +0000 @@ -20,7 +20,7 @@ depends: [ "ocaml" {>= "4.08"} "dune" {>= "1.10"} + "dune-configurator" "conf-libpcre" {build} - "base" {build} "base-bytes" ] diff -Nru pcre-ocaml-7.4.3/src/config/discover.ml pcre-ocaml-7.4.6/src/config/discover.ml --- pcre-ocaml-7.4.3/src/config/discover.ml 2019-10-27 21:30:56.000000000 +0000 +++ pcre-ocaml-7.4.6/src/config/discover.ml 2020-08-04 17:34:21.000000000 +0000 @@ -1,5 +1,3 @@ -open Base - let () = let module C = Configurator.V1 in C.main ~name:"pcre" (fun c -> @@ -7,9 +5,10 @@ libs = ["-lpcre"]; cflags = [] } in - let conf = - Option.value_map (C.Pkg_config.get c) ~default ~f:(fun pc -> - Option.value (C.Pkg_config.query pc ~package:"libpcre") ~default) + let conf = match C.Pkg_config.get c with + | None -> default + | Some pc -> + Option.value (C.Pkg_config.query pc ~package:"libpcre") ~default in C.Flags.write_sexp "c_flags.sexp" conf.cflags; C.Flags.write_sexp "c_library_flags.sexp" conf.libs) diff -Nru pcre-ocaml-7.4.3/src/config/dune pcre-ocaml-7.4.6/src/config/dune --- pcre-ocaml-7.4.3/src/config/dune 2019-10-27 21:30:56.000000000 +0000 +++ pcre-ocaml-7.4.6/src/config/dune 2020-08-04 17:34:21.000000000 +0000 @@ -1,4 +1,4 @@ (executables (names discover) - (libraries base dune.configurator) + (libraries dune.configurator) ) diff -Nru pcre-ocaml-7.4.3/src/dune pcre-ocaml-7.4.6/src/dune --- pcre-ocaml-7.4.3/src/dune 2019-10-27 21:30:56.000000000 +0000 +++ pcre-ocaml-7.4.6/src/dune 2020-08-04 17:34:21.000000000 +0000 @@ -1,11 +1,7 @@ (library (public_name pcre) (c_names pcre_stubs) - (c_flags - (:standard) - (:include c_flags.sexp) -O2 -fPIC -DPIC - -Wno-keyword-macro - ) + (c_flags (:standard) (:include c_flags.sexp) -O2 -fPIC -DPIC) (c_library_flags (:include c_library_flags.sexp)) ) diff -Nru pcre-ocaml-7.4.3/src/pcre_stubs.c pcre-ocaml-7.4.6/src/pcre_stubs.c --- pcre-ocaml-7.4.3/src/pcre_stubs.c 2019-10-27 21:30:56.000000000 +0000 +++ pcre-ocaml-7.4.6/src/pcre_stubs.c 2020-08-04 17:34:21.000000000 +0000 @@ -36,11 +36,9 @@ #endif #if __GNUC__ >= 3 -# define inline inline __attribute__ ((always_inline)) # define __unused __attribute__ ((unused)) #else # define __unused -# define inline #endif #include @@ -513,16 +511,11 @@ if (ftable == NULL) return None; else { value v_res, v_res_str; - char *ptr; - int i; Begin_roots1(v_rex); - v_res_str = caml_alloc_string(32); + v_res_str = caml_alloc_initialized_string(32, (char *) ftable); End_roots(); - ptr = String_val(v_res_str); - for (i = 0; i <= 31; ++i) { *ptr = *ftable; ++ptr; ++ftable; } - Begin_roots1(v_res_str); /* Allocates [Some string] from firsttable */ v_res = caml_alloc_small(1, 0);