[Pkg-ocaml-maint-commits] [SCM] ocaml-dbus packaging branch, master, updated. debian/0.29-1

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 8eab67d7656666d184e83faf968ea0b96ba30efa
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sun Oct 25 17:57:45 2009 +0000

    New upstream release
    
    * New upstream release (Closes: #542771)
    * Upgrade Standards-Version to 3.8.3 (section ocaml)
    * Use dh-ocaml 0.9.1 (depends and dh_ocamldoc)

diff --git a/debian/changelog b/debian/changelog
index 1c9ce69..e49d5c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-ocaml-dbus (0.07-2) UNRELEASED; urgency=low
+ocaml-dbus (0.29-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release (Closes: #542771)
   * Add debian/gbp.conf to force using pristine-tar
+  * Upgrade Standards-Version to 3.8.3 (section ocaml)
+  * Use dh-ocaml 0.9.1 (depends and dh_ocamldoc)
 
- -- Sylvain Le Gall <gildor at debian.org>  Sat, 07 Mar 2009 15:19:18 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Sun, 25 Oct 2009 17:51:18 +0000
 
 ocaml-dbus (0.07-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2353343..27a1890 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: ocaml-dbus
-Section: libdevel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Sylvain Le Gall <gildor at debian.org>
@@ -10,15 +10,16 @@ Build-Depends: cdbs (>= 0.4.52),
  dpatch, 
  libdbus-1-dev, 
  pkg-config,
- dh-ocaml (>= 0.4.1)
-Standards-Version: 3.8.0
+ dh-ocaml (>= 0.9.1)
+Standards-Version: 3.8.3
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-dbus.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-dbus.git
 Homepage: http://tab.snarc.org/projects/ocaml_dbus/
 
 Package: libdbus-ocaml
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${ocaml:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the D-Bus API
  This library provides OCaml bindings for using D-Bus.
  .
@@ -29,7 +30,8 @@ Description: OCaml bindings for the D-Bus API
 
 Package: libdbus-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libdbus-ocaml (= ${binary:Version}), ${misc:Depends}
+Depends: ${ocaml:Depends}, libdbus-ocaml (= ${binary:Version}), ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: OCaml bindings for the D-Bus API
  This library provides OCaml bindings for using D-Bus.
  .
diff --git a/debian/libdbus-ocaml-dev.ocamldoc b/debian/libdbus-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..c01ade2
--- /dev/null
+++ b/debian/libdbus-ocaml-dev.ocamldoc
@@ -0,0 +1 @@
+# Nothing
diff --git a/debian/rules b/debian/rules
index 229bbe6..85c8e2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,10 @@
 # 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/rules/ocaml.mk
 
 DESTDIR_DEV=$(CURDIR)/debian/libdbus-ocaml-dev
 DESTDIR=$(CURDIR)/debian/libdbus-ocaml
@@ -35,7 +35,5 @@ DEB_MAKE_INSTALL_TARGET  := install-byte
 endif
 DEB_MAKE_INSTALL_TARGET  += OCAMLDESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
 
-OCAML_OCAMLDOC_PACKAGES = libdbus-ocaml-dev
-
 install/libdbus-ocaml-dev::
 	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/dbus/*.so '$(DESTDIR)/$(OCAML_DLL_DIR)/'

-- 
ocaml-dbus packaging