From 735159402c903b6358deb7b518eb57b19ea04027 Mon Sep 17 00:00:00 2001
From: Anton Lavrik <alavrik@piqi.org>
Date: Tue, 31 May 2016 03:00:49 -0700
Subject: [PATCH] Update opam file and travis-ci scripts

---
 .travis-ci.sh | 18 ++++--------------
 .travis.yml   |  6 ++++--
 opam          |  5 ++++-
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.travis-ci.sh b/.travis-ci.sh
index 1aaba1b..28528d9 100755
--- a/.travis-ci.sh
+++ b/.travis-ci.sh
@@ -8,20 +8,10 @@ sudo apt-get install protobuf-compiler
 
 
 # build, run tests, build package, install package
-wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
+wget https://raw.githubusercontent.com/ocaml/ocaml-ci-scripts/master/.travis-opam.sh
 
-. .travis-opam.sh
-
-
-# build and test using the current development version of piqilib
-if [ -n "${PIQILIB_DEV-}" ]
-then
-    opam repo add piqi git://github.com/piqi/piqi-opam-repo.git
 
-    opam install piqilib.master
-
-    make distclean
-    make
-    make test
-fi
+# opam lint is way too demanding and varies from version to version
+export OPAM_LINT=false
 
+. .travis-opam.sh
diff --git a/.travis.yml b/.travis.yml
index 259d129..bd3cd8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,7 @@ env:
   - PACKAGE="piqi" OCAML_VERSION=3.12
   - PACKAGE="piqi" OCAML_VERSION=4.00
   - PACKAGE="piqi" OCAML_VERSION=4.01
-  - PACKAGE="piqi" OCAML_VERSION=4.02 PIQILIB_DEV=1
-  - PACKAGE="piqi" OCAML_VERSION=latest
+  - PACKAGE="piqi" OCAML_VERSION=4.02
+  - PACKAGE="piqi" OCAML_VERSION=4.03
+  # development version of piqilib
+  - PACKAGE="piqi" OCAML_VERSION=4.03 PINS=piqilib
diff --git a/opam b/opam
index 16a6316..b174527 100644
--- a/opam
+++ b/opam
@@ -1,7 +1,9 @@
-opam-version: "1"
+opam-version: "1.2"
 maintainer: "alavrik@piqi.org"
 build: [
   [make]
+]
+install: [
   [make "DESTDIR=%{prefix}%" "install"]
 ]
 remove: [
@@ -14,3 +16,4 @@ depends: [
   "piqilib"
   "base-bytes"
 ]
+dev-repo: "git://github.com/alavrik/piqi-ocaml"