[Pkg-ocaml-maint-commits] [ocaml-ipaddr] 03/06: Imported Upstream version 2.6.1

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository ocaml-ipaddr.

commit 0c04b4f2c02c8aea53c3b132efe6577d8203e806
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Mon Jan 18 00:11:54 2016 +0100

    Imported Upstream version 2.6.1
---
 .travis.yml | 6 +++---
 CHANGES     | 3 +++
 _oasis      | 2 +-
 lib/META    | 4 ++--
 setup.ml    | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f9a693..d3ac3fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,6 @@ language: c
 install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
 script: bash -ex .travis-opam.sh
 env:
-  - OCAML_VERSION=3.12   PACKAGE=ipaddr FORK_USER=dsheets
-  - OCAML_VERSION=4.01   PACKAGE=ipaddr FORK_USER=dsheets
-  - OCAML_VERSION=latest PACKAGE=ipaddr FORK_USER=dsheets
+  - OCAML_VERSION=3.12   PACKAGE=ipaddr
+  - OCAML_VERSION=4.01   PACKAGE=ipaddr
+  - OCAML_VERSION=latest PACKAGE=ipaddr
diff --git a/CHANGES b/CHANGES
index 1ae1543..063d1e9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2.6.1 (2015-02-20):
+* Fix findlib requires in oasis to restore pre-4.02.1 compatibility
+
 2.6.0 (2015-02-19):
 * Change IPv6 link-local address prefix from fe80::/10 to fe80::/64. (#39)
 * Remove type bytes = string alias (potentially breaking)
diff --git a/_oasis b/_oasis
index c7f6b61..9c193d8 100644
--- a/_oasis
+++ b/_oasis
@@ -19,7 +19,7 @@ Library ipaddr
   Path: lib
   Findlibname: ipaddr
   BuildDepends: bytes, sexplib, sexplib.syntax
-  XMETARequires: sexplib
+  XMETARequires: bytes, sexplib
   Modules: Ipaddr, Macaddr
   NativeOpt: -w @f at p@u at s@40
   ByteOpt:   -w @f at p@u at s@40
diff --git a/lib/META b/lib/META
index 79ba072..59082bf 100644
--- a/lib/META
+++ b/lib/META
@@ -1,9 +1,9 @@
 # OASIS_START
-# DO NOT EDIT (digest: d5c519d8529acf059fe6af7cb646920b)
+# DO NOT EDIT (digest: 41ee21d4146b5d6f59aa1b873b633a48)
 version = "2.6.0"
 description =
 "A library for manipulation of IP (and MAC) address representations"
-requires = "sexplib"
+requires = "bytes sexplib"
 archive(byte) = "ipaddr.cma"
 archive(byte, plugin) = "ipaddr.cma"
 archive(native) = "ipaddr.cmxa"
diff --git a/setup.ml b/setup.ml
index 47f0e05..d9ad49c 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.1 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 2fbdd337da5b6f4d5fab124a689fa8bb) *)
+(* DO NOT EDIT (digest: 90b714c94abc1fe7e83f38515fbe8e31) *)
 (*
    Regenerated by OASIS v0.4.4
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -7030,7 +7030,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.4";
-     oasis_digest = Some "\197k\244P\254\181\140\254\170Y\173\165\195xTr";
+     oasis_digest = Some "ex\027k\201\006S;\144\164\190\024\173\210%`";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false

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