[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. debian/1.3-1-1-g144deca

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 144deca35cb211dd11fa517d3d8c04b7f97baa10
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Thu Oct 8 23:04:41 2009 +0000

    Update to dh-ocaml 0.9
    
    * Use CDBS rules (Closes: #549151)
    * Use dh_ocamldoc
    * Use depends/provides

diff --git a/debian/changelog b/debian/changelog
index b88022b..5d13188 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pgocaml (1.3-2) UNRELEASED; urgency=low
+
+  * Update to dh-ocaml 0.9
+    * Use CDBS rules (Closes: #549151)
+    * Use dh_ocamldoc
+    * Use depends/provides
+
+ -- Sylvain Le Gall <gildor at debian.org>  Thu, 08 Oct 2009 22:20:12 +0000
+
 pgocaml (1.3-1) unstable; urgency=low
 
   * Initial release (Closes: #516629)
diff --git a/debian/control b/debian/control
index 733aa68..1362200 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,9 @@
 Source: pgocaml
 Section: ocaml
 Priority: optional
-Maintainer: "Debian OCaml Maintainers" <debian-ocaml-maint at lists.debian.org>
-Uploaders: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Guillaume Yziquel <guillaume.yziquel at citycable.ch>, 
+           Sylvain Le Gall <gildor at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: cdbs (>= 0.4.52),
  debhelper (>= 7),
@@ -15,17 +16,22 @@ Build-Depends: cdbs (>= 0.4.52),
  libpcre-ocaml-dev,
  libcsv-ocaml-dev,
  libcalendar-ocaml-dev (>= 2)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://developer.berlios.de/projects/pgocaml/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pgocaml.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pgocaml.git
 
 Package: libpgocaml-ocaml-dev
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI},
- libpgocaml-ocaml,
+Depends: libpgocaml-ocaml (= ${binary:Version}),
+ libextlib-ocaml-dev,
+ libpcre-ocaml-dev,
+ libcsv-ocaml-dev,
+ libcalendar-ocaml-dev (>= 2),
+ ${ocaml:Depends},
  ${misc:Depends},
  ${shlibs:Depends}
+Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Suggests: postgresql (>= 7.4)
 Description: OCaml type-safe bindings for PostgreSQL
@@ -41,13 +47,12 @@ Description: OCaml type-safe bindings for PostgreSQL
 
 Package: libpgocaml-ocaml
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI},
- libextlib-ocaml-dev,
- libpcre-ocaml-dev,
- libcsv-ocaml-dev,
- libcalendar-ocaml-dev (>= 2),
+Depends: libpcre-ocaml,
+ libcalendar-ocaml (>= 2),
+ ${ocaml:Depends},
  ${misc:Depends},
  ${shlibs:Depends}
+Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Suggests: postgresql (>= 7.4)
 Description: OCaml type-safe bindings for PostgreSQL
@@ -59,4 +64,4 @@ Description: OCaml type-safe bindings for PostgreSQL
  structure. This type-safe database access is the primary advantage that
  PG'OCaml has over other PostgreSQL bindings for OCaml.
  .
- This package contains dynamically loadable plugins for PostgreSQL.
+ This package contains dynamically loadable plugins for PG'OCaml.
diff --git a/debian/libpgocaml-ocaml-dev.todo-ocamldoc b/debian/libpgocaml-ocaml-dev.todo-ocamldoc
new file mode 100644
index 0000000..33bb33b
--- /dev/null
+++ b/debian/libpgocaml-ocaml-dev.todo-ocamldoc
@@ -0,0 +1 @@
+-package extlib -package pcre -package csv -package calendar
diff --git a/debian/rules b/debian/rules
index 5fdbedd..9bf6c80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,25 +17,14 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
+include /usr/share/cdbs/1/rules/ocaml.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/ocaml.mk
 
-#DESTDIR_DEV=$(CURDIR)/debian/libpgocaml-ocaml-dev
-
-DEB_MAKE_CLEAN_TARGET    := clean
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET    := all
-#DEB_MAKE_INSTALL_TARGET  := findlib_install
-else
-DEB_MAKE_BUILD_TARGET    := all
-#DEB_MAKE_INSTALL_TARGET  := findlib_install
-endif
-#DEB_MAKE_INSTALL_TARGET  += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
-
-OCAML_OCAMLDOC_PACKAGES = libpgocaml-ocaml-dev
-OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package extlib -package pcre -package csv -package calendar
+DEB_MAKE_CLEAN_TARGET   := clean
+DEB_MAKE_BUILD_TARGET   := all
+DEB_MAKE_INSTALL_TARGET := install DESTDIR=debian/libpgocaml-ocaml-dev/
 
 pre-build::
 	make depend

-- 
pgocaml packaging