Merge remote-tracking branch 'upstream/master'

.travis-ci.sh

@@ -3,7 +3,15 @@ echo pull req: $TRAVIS_PULL_REQUEST
 if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
   curl https://github.com/$TRAVIS_REPO_SLUG/pull/$TRAVIS_PULL_REQUEST.diff -o pullreq.diff
 else
-  git show > pullreq.diff
+  git show > pullreq.diff.tmp
+  merge=`grep "^Merge: " pullreq.diff.tmp | awk -F: '{print $2}'`
+  if [ "$merge" = "" ]; then
+    echo Not a merge
+    mv pullreq.diff.tmp pullreq.diff
+  else
+    echo Merge detected, extracting $merge diff
+    git show $merge > pullreq.diff
+  fi
 fi
 
 function install_opam10_from_source {
@@ -23,7 +31,7 @@ function install_opam11_from_source {
   make
   sudo make install
 }
- 
+
 # Install OCaml and OPAM PPAs
 case "$OCAML_VERSION,$OPAM_VERSION" in
 3.12.1,1.0.0)
@@ -62,17 +70,21 @@ function build_one {
   echo build one: $pkg
   rm -rf ~/.opam
   opam init .
-  allpkgs=`opam list -s -a`
+  # list all packages changed from opam 1.0 to 1.1
+  case "$OPAM_VERSION" in
+  1.0.0) allpkgs=`opam list -s` ;;
+  *) allpkgs=`opam list -s -a` ;;
+  esac
   # test for installability
   if [ "`echo $allpkgs | grep $pkg`" = "" ]; then
     echo Skipping $pkg as not installable
   else
     depext=`opam install $pkg -e ubuntu`
     echo Ubuntu depexts: $depext
     if [ "$depext" != "" ]; then 
-      sudo apt-get install $depext
+      sudo apt-get install -qq build-essential m4 $depext
     fi
-    opam install $pkgs
+    opam install $pkg
     if [ "$depext" != "" ]; then 
       sudo apt-get remove $depext
       sudo apt-get autoremove

packages/ocaml-expect.0.0.3/descr

@@ -0,0 +1,5 @@
+Simple implementation of "expect" to help building unitary testing of interactive program
+You can match the question using a regular expression or a timeout.
+
+See the Expect manual for more information:
+http://expect.nist.gov/

packages/ocaml-expect.0.0.3/opam

@@ -0,0 +1,11 @@
+opam-version: "1"
+maintainer: "contact@ocamlpro.com"
+build: [
+  ["ocaml" "setup.ml" "-configure" "--prefix" "%{prefix}%"]
+  ["ocaml" "setup.ml" "-build"]
+  ["ocaml" "setup.ml" "-install"]
+]
+remove: [
+  ["ocamlfind" "remove" "expect"]
+]
+depends: ["ocamlfind" "extlib" {= "1.5.3"} "ounit" "pcre-ocaml"]

packages/ocaml-expect.0.0.3/url

@@ -0,0 +1,2 @@
+archive: "https://forge.ocamlcore.org/frs/download.php/894/ocaml-expect-0.0.3.tar.gz"
+checksum: "3ac7f4bf2cfa9e7e8375c231be384248"

packages/rdf.0.7.1/descr

@@ -0,0 +1,2 @@
+Native OCaml implementation of RDF Graphs and Sparql 1.1 Query.
+

packages/rdf.0.7.1/opam

@@ -0,0 +1,33 @@
+opam-version: "1"
+maintainer: "zoggy@bat8.org"
+homepage: "http://zoggy.github.io/ocaml-rdf/"
+doc: "http://zoggy.github.io/ocaml-rdf/doc.html"
+
+authors: ["Maxence Guesdon"]
+
+license: "GNU Lesser General Public License version 3"
+
+tags: ["rdf" "semantic web" "xml" "turtle" "graph" "sparql" "utf8"]
+
+build: [
+  ["./configure" "--prefix" "%{prefix}%" ]
+  [make "all" ]
+  [make "install" ]
+]
+remove: [
+  ["ocamlfind" "remove" "rdf"]
+]
+depends: ["ocamlfind"
+  "xmlm" {>= "1.1.1"}
+  "ocamlnet" {>= "3.6.5"}
+  "ulex" { >= "1.1" }
+  "menhir" {>= "20120123" }
+  "uuidm" {>= "0.9.5" }
+  "cryptokit" {>= "1.7" }
+  "pcre-ocaml" {>= "7.0.2" }
+]
+depopts: [
+  "ocaml-mysql" { >= "1.1.1" }
+  "postgresql-ocaml"
+]
+ocaml-version: [ >= "4.00.0" ]

packages/rdf.0.7.1/url

@@ -0,0 +1,2 @@
+archive: "http://zoggy.github.io/ocaml-rdf/ocaml-rdf-0.7.1.tar.gz"
+checksum: "31395f1f283a1bdd10c72ed7ef9de321"

packages/sedlex.1.99.1/descr

@@ -0,0 +1 @@
+unicode-friendly lexer generator (successor of ulex, now based on -ppx instead of camlp4)

packages/sedlex.1.99.1/opam

@@ -0,0 +1,12 @@
+opam-version: "1"
+maintainer: "alain.frisch@lexifi.com"
+build: [
+  [make "all"]
+  [make "opt"]
+  [make "install"]
+]
+remove: [
+  ["ocamlfind" "remove" "sedlex"]
+]
+depends: ["ocamlfind" "ppx_tools"]
+ocaml-version: [ >= "4.02.0" ]

packages/sedlex.1.99.1/url

@@ -0,0 +1,2 @@
+git: "git://github.com/alainfrisch/sedlex.git"
+

packages/stog-rdf.0.6/url

@@ -1,2 +1,2 @@
-archive: "http://zoggy.github.com/stog/stog-rdf-0.6.tar.gz"
+archive: "http://zoggy.github.com/stog/plugins/stog-rdf-0.6.tar.gz"
 checksum: "289430a64cb87a902f25ce4c616e7dec"

packages/stog-rdf.0.7.0/url

@@ -1,2 +1,2 @@
-archive: "http://zoggy.github.com/stog/stog-rdf-0.7.0.tar.gz"
+archive: "http://zoggy.github.com/stog/plugins/stog-rdf-0.7.0.tar.gz"
 checksum: "18f23579b8aa8801752aca97ade79abf"

packages/stog-rdf.0.8.0/url

@@ -1,2 +1,2 @@
-archive: "http://zoggy.github.com/stog/stog-rdf-0.8.0.tar.gz"
+archive: "http://zoggy.github.com/stog/plugins/stog-rdf-0.8.0.tar.gz"
 checksum: "d208fc70064a169e06b8f6236fd229da"

packages/stog-rdf.0.9.0/descr

@@ -0,0 +1 @@
+Plugin for Stog. Define and query RDF graphs in rewrite rules.

packages/stog-rdf.0.9.0/opam

@@ -0,0 +1,21 @@
+opam-version: "1"
+maintainer: "zoggy@bat8.org"
+homepage: "http://zoggy.github.io/stog/plugins/rdf.html"
+doc: "http://zoggy.github.io/stog/plugins/rdf.html"
+
+authors: ["Maxence Guesdon"]
+
+license: "GNU General Public License version 3"
+
+build: [
+  [make "all"]
+  [make "install"]
+]
+remove: [
+  ["ocamlfind" "remove" "stog-rdf"]
+]
+depends: [
+  "stog" {>= "0.9.0"}
+  "rdf" {>= "0.7.0"}
+]
+ocaml-version: [ >= "4.00.0" ]

packages/stog-rdf.0.9.0/url

@@ -0,0 +1,2 @@
+archive: "http://zoggy.github.com/stog/plugins/stog-rdf-0.9.0.tar.gz"
+checksum: "4c0da5443c5104d7c0c6ed563ba958d8"

packages/stog-writing.0.6/url

@@ -1,2 +1,2 @@
-archive: "http://zoggy.github.com/stog/stog-writing-0.6.tar.gz"
+archive: "http://zoggy.github.com/stog/plugins/stog-writing-0.6.tar.gz"
 checksum: "b123792d9de9a67f89edcc6747517528"

packages/stog-writing.0.7.0/url

@@ -1,2 +1,2 @@
-archive: "http://zoggy.github.com/stog/stog-writing-0.7.0.tar.gz"
+archive: "http://zoggy.github.com/stog/plugins/stog-writing-0.7.0.tar.gz"
 checksum: "52e7e94fcc4b39ec4a63fa1647391e6c"

packages/stog-writing.0.8.0/url

@@ -1,2 +1,2 @@
-archive: "http://zoggy.github.com/stog/stog-writing-0.8.0.tar.gz"
+archive: "http://zoggy.github.com/stog/plugins/stog-writing-0.8.0.tar.gz"
 checksum: "c0a9009f1c8795556f535d6b8eec8d06"