[Pkg-ocaml-maint-commits] [SCM] oasis packaging branch, master, updated. upstream/0.2.0.alpha1-5-g10b07db

2011-04-04 Thread Sylvain Le Gall
The following commit has been merged in the master branch:
commit a8228a70a42d80b3995f5c78862da0f1bc136a46
Author: Sylvain Le Gall gil...@debian.org
Date:   Mon Apr 4 16:49:19 2011 +0200

Fix various lintian warnings

diff --git a/_tags b/_tags
index 45b3b0f..f89086b 100644
--- a/_tags
+++ b/_tags
@@ -218,4 +218,4 @@
 src/cli/Main.byte: -use_base
 src/cli/Main.byte: -use_oasis
 
-src/builtin-plugins.cma: use_ocamlbuild
+#src/builtin-plugins.cma: use_ocamlbuild
diff --git a/debian/changelog b/debian/changelog
index a13cf13..7a34ce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 oasis (0.2.0-1) UNRELEASED; urgency=low
 
-  * Closes: #603830:
-  * Initial release. (Closes: #XX)
+  * Initial release. (Closes: #603830)
 
  -- Sylvain Le Gall gil...@debian.org  Mon, 22 Nov 2010 15:59:13 +0100
diff --git a/debian/control b/debian/control
index af90a3d..2705551 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends:
   ocaml-nox (= 3.11.1-3~),
   ocaml-findlib,
   ocaml-base-nox,
-  make,
   libpcre-ocaml-dev,
   libounit-ocaml-dev (= 1.1.0),
   libodn-ocaml-dev (= 0.0.3),
@@ -38,10 +37,10 @@ Description: Architecture for building OCaml libraries and 
applications
  between various subsystems that do the job. It should support the following
  tools:
  .
- - OCamlbuild
- - OMake (todo)
- - OCamlMakefile (todo),
- - ocaml-autoconf (todo)
+  - OCamlbuild
+  - OMake (todo)
+  - OCamlMakefile (todo),
+  - ocaml-autoconf (todo)
  .
  It also features a do-it-yourself command line invocation and an internal
  configure/install scheme. Libraries are managed through findlib. It has been
@@ -67,10 +66,10 @@ Description: Architecture for building OCaml libraries and 
applications
  between various subsystems that do the job. It should support the following
  tools:
  .
- - OCamlbuild
- - OMake (todo)
- - OCamlMakefile (todo),
- - ocaml-autoconf (todo)
+  - OCamlbuild
+  - OMake (todo)
+  - OCamlMakefile (todo),
+  - ocaml-autoconf (todo)
  .
  It also features a do-it-yourself command line invocation and an internal
  configure/install scheme. Libraries are managed through findlib. It has been
@@ -82,7 +81,7 @@ Description: Architecture for building OCaml libraries and 
applications
 Package: liboasis-ocaml
 Architecture: any
 Suggests: liboasis-ocaml-doc
-Depends: ${ocaml:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${ocaml:Depends}, ${misc:Depends}
 Provides: ${ocaml:Provides}
 Description: Architecture for building OCaml libraries and applications
  OASIS generates a full configure, build and install system for your
@@ -93,10 +92,10 @@ Description: Architecture for building OCaml libraries and 
applications
  between various subsystems that do the job. It should support the following
  tools:
  .
- - OCamlbuild
- - OMake (todo)
- - OCamlMakefile (todo),
- - ocaml-autoconf (todo)
+  - OCamlbuild
+  - OMake (todo)
+  - OCamlMakefile (todo),
+  - ocaml-autoconf (todo)
  .
  It also features a do-it-yourself command line invocation and an internal
  configure/install scheme. Libraries are managed through findlib. It has been
@@ -109,7 +108,6 @@ Description: Architecture for building OCaml libraries and 
applications
 
 Package: liboasis-ocaml-doc
 Architecture: all
-Suggests: liboasis-ocaml-doc
 Section: doc
 Depends: ${misc:Depends}
 Description: Architecture for building OCaml libraries and applications
@@ -121,10 +119,10 @@ Description: Architecture for building OCaml libraries 
and applications
  between various subsystems that do the job. It should support the following
  tools:
  .
- - OCamlbuild
- - OMake (todo)
- - OCamlMakefile (todo),
- - ocaml-autoconf (todo)
+  - OCamlbuild
+  - OMake (todo)
+  - OCamlMakefile (todo),
+  - ocaml-autoconf (todo)
  .
  It also features a do-it-yourself command line invocation and an internal
  configure/install scheme. Libraries are managed through findlib. It has been
diff --git a/debian/liboasis-ocaml-doc.doc-base.2 
b/debian/liboasis-ocaml-doc.doc-base.2
index 4cd8d97..42b44a4 100644
--- a/debian/liboasis-ocaml-doc.doc-base.2
+++ b/debian/liboasis-ocaml-doc.doc-base.2
@@ -2,6 +2,5 @@ Document: oasis-manual
 Title: OASIS User Manual
 Section: Programming/OCaml
 
-Format: HTML
-Index: /usr/share/doc/liboasis-ocaml-doc/index.html
-Files: /usr/share/doc/liboasis-ocaml-doc/*
+Format: Text 
+Files: /usr/share/doc/liboasis-ocaml-doc/MANUAL.mkd.gz
diff --git a/debian/patches/debian-changes-0.2.0-1 
b/debian/patches/debian-changes-0.2.0-1
new file mode 100644
index 000..250be86
--- /dev/null
+++ b/debian/patches/debian-changes-0.2.0-1
@@ -0,0 +1,34 @@
+Description: Upstream changes introduced in version 0.2.0-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ oasis (0.2.0-1) UNRELEASED; urgency=low
+ .
+   * Initial release. (Closes: #603830)
+ .
+ The person named in the Author field signed this 

[Pkg-ocaml-maint-commits] [SCM] oasis packaging branch, master, updated. upstream/0.2.0.alpha1-5-g10b07db

2011-04-04 Thread Sylvain Le Gall
The following commit has been merged in the master branch:
commit 20b7e942fc328b85a05327948f0226ac8917df93
Author: Sylvain Le Gall gil...@debian.org
Date:   Mon Apr 4 17:10:02 2011 +0200

Move MANUAL.mkd to package oasis and write a manpage

diff --git a/debian/liboasis-ocaml-doc.install 
b/debian/liboasis-ocaml-doc.install
index 51319f7..e58d728 100644
--- a/debian/liboasis-ocaml-doc.install
+++ b/debian/liboasis-ocaml-doc.install
@@ -1 +1 @@
-usr/share/doc/liboasis-ocaml-doc
+usr/share/doc/liboasis-ocaml-doc/oasis
diff --git a/debian/oasis.1 b/debian/oasis.1
new file mode 100644
index 000..523b45f
--- /dev/null
+++ b/debian/oasis.1
@@ -0,0 +1,24 @@
+.TH OASIS 1 March 4, 2011 oasis manpage
+.SH NAME
+.PP
+oasis - generates a complete build system for OCaml libraries and
+applications.
+.SH SYNOPSIS
+.PP
+oasis [command] options\...
+.SH DESCRIPTION
+.PP
+This program allows to manipulate OASIS enabled package,
+i.e.\ package that contains an \f[B]_oasis\f[] file.
+It is made of several subcommands that provide features around this
+file.
+Some subcommands require the installation of third party plugins.
+.PP
+To get a complete list of subcommands and their options, run
+\f[B]oasis\ help\f[].
+.SH SEE ALSO
+.PP
+OASIS user manual \f[B]/usr/share/doc/oasis/MANUAL.mkd.gz\f[]
+.SH AUTHORS
+Sylvain Le Gall.
+
diff --git a/debian/liboasis-ocaml-doc.doc-base.2 b/debian/oasis.doc-base.1
similarity index 62%
rename from debian/liboasis-ocaml-doc.doc-base.2
rename to debian/oasis.doc-base.1
index 42b44a4..549912e 100644
--- a/debian/liboasis-ocaml-doc.doc-base.2
+++ b/debian/oasis.doc-base.1
@@ -3,4 +3,4 @@ Title: OASIS User Manual
 Section: Programming/OCaml
 
 Format: Text 
-Files: /usr/share/doc/liboasis-ocaml-doc/MANUAL.mkd.gz
+Files: /usr/share/doc/oasis/MANUAL.mkd.gz
diff --git a/debian/oasis.install b/debian/oasis.install
index e772481..477da5d 100644
--- a/debian/oasis.install
+++ b/debian/oasis.install
@@ -1 +1,2 @@
 usr/bin
+usr/share/doc/liboasis-ocaml-doc/MANUAL.mkd usr/share/doc/oasis/
diff --git a/debian/oasis.manpages b/debian/oasis.manpages
new file mode 100644
index 000..6e84e78
--- /dev/null
+++ b/debian/oasis.manpages
@@ -0,0 +1 @@
+debian/oasis.1
diff --git a/debian/oasis.mkd b/debian/oasis.mkd
new file mode 100644
index 000..4567c99
--- /dev/null
+++ b/debian/oasis.mkd
@@ -0,0 +1,24 @@
+% OASIS(1) oasis manpage
+% Sylvain Le Gall 
+% March 4, 2011
+
+# NAME
+
+oasis - generates a complete build system for OCaml libraries and applications.
+
+# SYNOPSIS
+
+oasis [command] options...
+
+# DESCRIPTION
+
+This program allows to manipulate OASIS enabled package, i.e. package that
+contains an `_oasis` file. It is made of several subcommands that provide
+features around this file. Some subcommands require the installation of
+third party plugins.
+
+To get a complete list of subcommands and their options, run `oasis help`.
+
+# SEE ALSO
+
+OASIS user manual `/usr/share/doc/oasis/MANUAL.mkd.gz`
diff --git a/debian/rules b/debian/rules
index 74786fe..2a2478d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,3 +42,6 @@ override_dh_install:
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
ocaml setup.ml -distclean
+
+debian/oasis.1: debian/oasis.mkd
+   pandoc -s -w man $^ -o $@

-- 
oasis packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits


[Pkg-ocaml-maint-commits] [SCM] oasis packaging branch, master, updated. upstream/0.2.0.alpha1-5-g10b07db

2011-04-04 Thread Sylvain Le Gall
The following commit has been merged in the master branch:
commit 10b07db826cbe0140719f2af760760e481f42660
Author: Sylvain Le Gall gil...@debian.org
Date:   Mon Apr 4 17:18:02 2011 +0200

Prepare release

diff --git a/debian/changelog b/debian/changelog
index 7a34ce8..1d5ed05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-oasis (0.2.0-1) UNRELEASED; urgency=low
+oasis (0.2.0-1) unstable; urgency=low
 
   * Initial release. (Closes: #603830)
 

-- 
oasis packaging

___
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits