From b9732b41f4a10d2bebbe5d2ebc4e6cac75c9842d Mon Sep 17 00:00:00 2001 From: Christophe Troestler Date: Wed, 10 Oct 2018 18:58:25 +0200 Subject: [PATCH] Use opam 2.0 format --- cairo2-gtk.descr | 1 - cairo2-gtk.opam | 19 +++++++++++-------- cairo2-pango.descr | 1 - cairo2-pango.opam | 19 +++++++++++-------- cairo2.descr | 6 ------ cairo2.opam | 25 ++++++++++++++----------- 6 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 cairo2-gtk.descr delete mode 100644 cairo2-pango.descr delete mode 100644 cairo2.descr diff --git a/cairo2-gtk.descr b/cairo2-gtk.descr deleted file mode 100644 index 83007a9..0000000 --- a/cairo2-gtk.descr +++ /dev/null @@ -1 +0,0 @@ -Rendering Cairo on Gtk canvas. diff --git a/cairo2-gtk.opam b/cairo2-gtk.opam index d8d548f..c8cc2c3 100644 --- a/cairo2-gtk.opam +++ b/cairo2-gtk.opam @@ -1,19 +1,20 @@ -opam-version: "1.2" +opam-version: "2.0" maintainer: "Christophe Troestler " authors: [ "Christophe Troestler " "Pierre Hauweele " ] license: "LGPL-3.0 with OCaml linking exception" homepage: "https://github.com/Chris00/ocaml-cairo" -dev-repo: "https://github.com/Chris00/ocaml-cairo.git" +dev-repo: "git+https://github.com/Chris00/ocaml-cairo.git" bug-reports: "https://github.com/Chris00/ocaml-cairo/issues" doc: "https://Chris00.github.io/ocaml-cairo/doc" -tags: [ "Cairo" "stroke" "drawing" "tutorial" ] +tags: ["Cairo" "stroke" "drawing" "tutorial"] build: [ - [ "dune" "subst" ] {pinned} - [ "dune" "build" "-p" name "-j" jobs ] + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "build" "@doc"] {with-doc} ] -build-doc: [ "dune" "build" "@doc" ] depends: [ + "ocaml" {>= "4.02"} "base-bigarray" "dune" {build} "conf-pkg-config" {build} @@ -21,5 +22,7 @@ depends: [ "cairo2" "lablgtk2" ] -available: [ ocaml-version >= "4.02" ] - +synopsis: "Rendering Cairo on Gtk canvas" +description: """ +This provides the link between Cairo and Lablgtk. +""" diff --git a/cairo2-pango.descr b/cairo2-pango.descr deleted file mode 100644 index dac0363..0000000 --- a/cairo2-pango.descr +++ /dev/null @@ -1 +0,0 @@ -Interface between Cairo and Pango diff --git a/cairo2-pango.opam b/cairo2-pango.opam index d8d548f..340508d 100644 --- a/cairo2-pango.opam +++ b/cairo2-pango.opam @@ -1,19 +1,20 @@ -opam-version: "1.2" +opam-version: "2.0" maintainer: "Christophe Troestler " authors: [ "Christophe Troestler " "Pierre Hauweele " ] license: "LGPL-3.0 with OCaml linking exception" homepage: "https://github.com/Chris00/ocaml-cairo" -dev-repo: "https://github.com/Chris00/ocaml-cairo.git" +dev-repo: "git+https://github.com/Chris00/ocaml-cairo.git" bug-reports: "https://github.com/Chris00/ocaml-cairo/issues" doc: "https://Chris00.github.io/ocaml-cairo/doc" -tags: [ "Cairo" "stroke" "drawing" "tutorial" ] +tags: ["Cairo" "stroke" "drawing" "tutorial"] build: [ - [ "dune" "subst" ] {pinned} - [ "dune" "build" "-p" name "-j" jobs ] + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "build" "@doc"] {with-doc} ] -build-doc: [ "dune" "build" "@doc" ] depends: [ + "ocaml" {>= "4.02"} "base-bigarray" "dune" {build} "conf-pkg-config" {build} @@ -21,5 +22,7 @@ depends: [ "cairo2" "lablgtk2" ] -available: [ ocaml-version >= "4.02" ] - +synopsis: "Interface between Cairo and Pango" +description: """ +Interface lablgtk Pango interface with Cairo. +""" diff --git a/cairo2.descr b/cairo2.descr deleted file mode 100644 index 77f7151..0000000 --- a/cairo2.descr +++ /dev/null @@ -1,6 +0,0 @@ -Binding to Cairo, a 2D Vector Graphics Library. - -This is a binding to Cairo, a 2D graphics library with support for -multiple output devices. Currently supported output targets include -the X Window System, Quartz, Win32, image buffers, PostScript, PDF, -and SVG file output. diff --git a/cairo2.opam b/cairo2.opam index 04ccb2a..f143987 100644 --- a/cairo2.opam +++ b/cairo2.opam @@ -1,22 +1,21 @@ -opam-version: "1.2" +opam-version: "2.0" maintainer: "Christophe Troestler " authors: [ "Christophe Troestler " "Pierre Hauweele " ] license: "LGPL-3.0 with OCaml linking exception" homepage: "https://github.com/Chris00/ocaml-cairo" -dev-repo: "https://github.com/Chris00/ocaml-cairo.git" +dev-repo: "git+https://github.com/Chris00/ocaml-cairo.git" bug-reports: "https://github.com/Chris00/ocaml-cairo/issues" doc: "https://Chris00.github.io/ocaml-cairo/doc" -tags: [ "Cairo" "stroke" "drawing" "tutorial" ] +tags: ["Cairo" "stroke" "drawing" "tutorial"] build: [ - [ "dune" "subst" ] {pinned} - [ "dune" "build" "-p" name "-j" jobs ] + ["dune" "subst"] {pinned} + ["dune" "build" "-p" name "-j" jobs] + ["dune" "runtest" "-p" name "-j" jobs] {with-test} + ["dune" "build" "@doc"] {with-doc} ] -build-test: [ - [ "dune" "runtest" "-p" name "-j" jobs ] -] -build-doc: [ "dune" "build" "@doc" ] depends: [ + "ocaml" {>= "4.02"} "base-bigarray" "dune" {build} "conf-cairo" @@ -28,5 +27,9 @@ conflicts: [ "cairo" {= "0.4.1"} "cairo" {= "0.4.2"} ] -available: [ ocaml-version >= "4.02" ] - +synopsis: "Binding to Cairo, a 2D Vector Graphics Library" +description: """ +This is a binding to Cairo, a 2D graphics library with support for +multiple output devices. Currently supported output targets include +the X Window System, Quartz, Win32, image buffers, PostScript, PDF, +and SVG file output."""