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

Mon Apr 4 15:18:25 UTC 2011

The following commit has been merged in the master branch:
commit a8228a70a42d80b3995f5c78862da0f1bc136a46
Author: Sylvain Le Gall <gildor at 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: #XXXXXX)
+  * Initial release. (Closes: #603830)
 
  -- Sylvain Le Gall <gildor at 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 0000000..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 changelog entry.
+Author: Sylvain Le Gall <gildor at debian.org>
+Bug-Debian: http://bugs.debian.org/603830
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- oasis-0.2.0.orig/_tags
++++ oasis-0.2.0/_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/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4656b53
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes-0.2.0-1
diff --git a/debian/rules b/debian/rules
index 78fe797..74786fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-DESTDIR=$(CURDIR)/debian/liboasis-ocaml-doc
+DESTDIR=$(CURDIR)/debian/tmp
 
 include /usr/share/ocaml/ocamlvars.mk
 

-- 
oasis packaging

