[Pkg-ocaml-maint-commits] [opam] 01/02: Refresh patches
Mehdi Dogguy
mehdi at moszumanska.debian.org
Tue Jul 28 21:21:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch patch-queue/master
in repository opam.
commit 98f21c07679e2efb5f785a54c4057c39e330d1fe
Author: Mehdi Dogguy <mehdi at debian.org>
Date: Mon Jul 20 01:43:51 2015 +0000
Refresh patches
---
.../0002-Import-uutf-and-jsonm-temporarily.patch | 69 ----------------------
debian/patches/series | 2 +-
2 files changed, 1 insertion(+), 70 deletions(-)
diff --git a/debian/patches/0002-Import-uutf-and-jsonm-temporarily.patch b/debian/patches/0002-Import-uutf-and-jsonm-temporarily.patch
index 6fa039e..22f1da3 100644
--- a/debian/patches/0002-Import-uutf-and-jsonm-temporarily.patch
+++ b/debian/patches/0002-Import-uutf-and-jsonm-temporarily.patch
@@ -3,7 +3,6 @@ Date: Wed, 22 Oct 2014 22:53:12 +0200
Subject: Import uutf and jsonm (temporarily)
---
- configure | 50 ---
thirdparty/jsonm/jsonm.ml | 646 +++++++++++++++++++++++++++++++++++
thirdparty/jsonm/jsonm.mli | 532 +++++++++++++++++++++++++++++
thirdparty/uutf/uutf.ml | 799 ++++++++++++++++++++++++++++++++++++++++++++
@@ -14,74 +13,6 @@ Subject: Import uutf and jsonm (temporarily)
create mode 100644 thirdparty/uutf/uutf.ml
create mode 100644 thirdparty/uutf/uutf.mli
-diff --git a/configure b/configure
-index b3a73f6..543d0fb 100755
---- a/configure
-+++ b/configure
-@@ -586,8 +586,6 @@ PACKAGE_URL=''
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- hasalldeps
--OCAML_PKG_jsonm
--OCAML_PKG_uutf
- OCAML_PKG_dose3
- OCAML_PKG_cudf
- OCAML_PKG_ocamlgraph
-@@ -4477,54 +4475,6 @@ $as_echo "not found" >&6; }
-
-
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml findlib package uutf" >&5
--$as_echo_n "checking for OCaml findlib package uutf... " >&6; }
--
-- unset found
-- unset pkg
-- found=no
-- for pkg in uutf ; do
-- if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
--$as_echo "found" >&6; }
-- OCAML_PKG_uutf=$pkg
-- found=yes
-- break
-- fi
-- done
-- if test "$found" = "no" ; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
--$as_echo "not found" >&6; }
-- OCAML_PKG_uutf=no
-- fi
--
--
--
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCaml findlib package jsonm" >&5
--$as_echo_n "checking for OCaml findlib package jsonm... " >&6; }
--
-- unset found
-- unset pkg
-- found=no
-- for pkg in jsonm ; do
-- if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
--$as_echo "found" >&6; }
-- OCAML_PKG_jsonm=$pkg
-- found=yes
-- break
-- fi
-- done
-- if test "$found" = "no" ; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
--$as_echo "not found" >&6; }
-- OCAML_PKG_jsonm=no
-- fi
--
--
--
--
- echo
-
- if test "$OCAML_PKG_extlib" = "no" ||
diff --git a/thirdparty/jsonm/jsonm.ml b/thirdparty/jsonm/jsonm.ml
new file mode 100644
index 0000000..80e0ec7
diff --git a/debian/patches/series b/debian/patches/series
index 840e637..0e10a9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-0001-Fix-some-spelling-errors.patch
+#0001-Fix-some-spelling-errors.patch
0002-Import-uutf-and-jsonm-temporarily.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/opam.git
More information about the Pkg-ocaml-maint-commits
mailing list