[Pkg-ocaml-maint-commits] [SCM] pycaml packaging branch, master, updated. debian/0.82-10-1-g703bba4

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 703bba4b43a62f6d98b26b1f4e93dea79bdfe66c
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 26 11:27:32 2009 +0200

    Adapt to new dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index 8c68511..da3ef23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pycaml (0.82-11) UNRELEASED; urgency=low
+
+  * debian/control:
+    - adapt to new dh-ocaml
+    - move to section ocaml
+    - update Standards-Version to 3.8.2
+
+ -- Stephane Glondu <steph at glondu.net>  Sun, 26 Jul 2009 11:26:26 +0200
+
 pycaml (0.82-10) unstable; urgency=low
 
   [ Stephane Glondu ]
diff --git a/debian/control b/debian/control
index 7080cff..71a3af2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: pycaml
-Section: libdevel
+Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
@@ -12,10 +12,10 @@ Build-Depends:
  quilt (>= 0.46-7),
  python-support,
  python-dev,
- dh-ocaml,
+ dh-ocaml (>= 0.9),
  ocaml-nox (>= 3.11),
  ocamlmakefile
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Homepage: http://pycaml.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pycaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pycaml.git
@@ -23,11 +23,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pycaml.git
 Package: pycaml
 Architecture: any
 Depends:
- ocaml-base-nox-${F:OCamlABI},
- ocaml-interp,
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Recommends: ocaml-nox-${F:OCamlABI}
+Provides: ${ocaml:Provides}
 Suggests: ocaml-findlib
 Description: OCaml bindings to embed Python interpreter and objects
  Pycaml is intended to allow users to build native OCaml libraries and
diff --git a/debian/rules b/debian/rules
index 9520df2..19f7b41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,17 +4,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/quilt/quilt.make
-
 DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 CFLAGS += -Wall
 
 %:
-	dh --with quilt $@
+	dh --with quilt --with ocaml $@
 
 .PHONY: override_dh_auto_configure
-override_dh_auto_configure: ocamlinit
+override_dh_auto_configure:
 	cp debian/Makefile .
 
 .PHONY: override_dh_auto_build
@@ -26,13 +23,13 @@ else
 endif
 
 .PHONY: override_dh_auto_clean
-override_dh_auto_clean: ocamlinit-clean
+override_dh_auto_clean:
 	$(MAKE) -f debian/Makefile clean
 
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
 	$(MAKE) rawinstall OCAML_LIB_INSTALL=$(DESTDIR)/pycaml
 
-.PHONY: override_dh_gencontrol
-override_dh_gencontrol:
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
+.PHONY: override_dh_ocaml
+override_dh_ocaml:
+	dh_ocaml --runtime-map pycaml

-- 
pycaml packaging