[Pkg-ocaml-maint-commits] [SCM] camlidl packaging branch, master, updated. debian/1.05-12-1-ga1fc48d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit a1fc48dea3bacbb51a2d2216ffa4814eed44e395
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 26 03:30:17 2009 +0200

    Adapt to new dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index d47bb4b..0b010ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+camlidl (1.05-13) UNRELEASED; urgency=low
+
+  * debian/control:
+    - adapt to new dh-ocaml
+    - move to section ocaml
+    - update Standards-Version to 3.8.2
+  * debian/rules: fix order of CDBS includes
+
+ -- Stephane Glondu <steph at glondu.net>  Sun, 26 Jul 2009 03:30:59 +0200
+
 camlidl (1.05-12) unstable; urgency=low
 
   * Add missing build-dependency on dh-ocaml.
diff --git a/debian/control b/debian/control
index 3629e61..5f023bf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,37 @@
 Source: camlidl
-Section: devel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:  Ralf Treinen <treinen at debian.org>, Remi Vanicat <vanicat at debian.org>, Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>, Sven Luther <luther at debian.org>, Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), dpatch, ocaml-nox (>= 3.11), po4a, docbook-xml (>= 4.4), docbook-xsl, libxml2-utils, xsltproc, debhelper (>= 7), cpp, binutils, dh-ocaml
-Standards-Version: 3.8.0
+Build-Depends: cdbs (>= 0.4.23-1.1),
+ dpatch,
+ ocaml-nox (>= 3.11),
+ po4a,
+ docbook-xml (>= 4.4),
+ docbook-xsl,
+ libxml2-utils,
+ xsltproc,
+ debhelper (>= 7),
+ cpp,
+ binutils,
+ dh-ocaml (>= 0.9)
+Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlidl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlidl.git
 
 Package: camlidl
-Section: devel
 Architecture: any
 Suggests: camlidl-doc
-Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Conflicts: camlidl-doc (<< 1.04)
 Description: Stub code generator for Objective Caml
  CamlIDL generates stub code for interfacing Caml with C from an IDL
  description of the C functions.  Thus, CamlIDL automates the most
- tedious task in interfacing C libraries with Caml programs. 
+ tedious task in interfacing C libraries with Caml programs.
  .
  It can also be used to interface Caml programs with other languages, as
  long as those languages have a well-defined C interface.
diff --git a/debian/control.in b/debian/control.in
index e476113..ce339cb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,23 +1,29 @@
 Source: camlidl
-Section: devel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: @OCamlTeam@
-Build-Depends: @cdbs@, debhelper (>= 7), cpp, binutils
-Standards-Version: 3.8.0
+Build-Depends: @cdbs@,
+ debhelper (>= 7),
+ cpp,
+ binutils,
+ dh-ocaml (>= 0.9)
+Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/camlidl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/camlidl.git
 
 Package: camlidl
-Section: devel
 Architecture: any
 Suggests: camlidl-doc
-Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
 Conflicts: camlidl-doc (<< 1.04)
 Description: Stub code generator for Objective Caml
  CamlIDL generates stub code for interfacing Caml with C from an IDL
  description of the C functions.  Thus, CamlIDL automates the most
- tedious task in interfacing C libraries with Caml programs. 
+ tedious task in interfacing C libraries with Caml programs.
  .
  It can also be used to interface Caml programs with other languages, as
  long as those languages have a well-defined C interface.
diff --git a/debian/rules b/debian/rules
index 35732fd..796cd18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,10 @@
 # Generate debian/control using
 # fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
 
-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/debhelper.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
+include /usr/share/cdbs/1/class/makefile.mk
 include $(CURDIR)/debian/mk/docbook-manpage.mk
 
 PACKAGE := camlidl
@@ -44,6 +44,9 @@ DOCBOOK_MANPAGE_SOURCES := $(CURDIR)/debian/xml-man/en/camlidl.xml
 
 DOCBOOK_MANPAGE_EXTRA_SOURCES := $(CURDIR)/debian/xml-man/en/license.xml      \
                                  $(CURDIR)/debian/xml-man/en/refentryinfo.xml
+
+OCAML_DHOCAML_FLAGS += --runtime-map camlidl
+
 clean::
 	-$(RM) $(CURDIR)/lib/com.cmxa
 	-$(RM) $(CURDIR)/lib/com.a

-- 
camlidl packaging