[Pkg-ocaml-maint-commits] [SCM] perl4caml packaging branch, master, updated. debian/0.9.5-2-5-g55dd47d

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 39734454ce36e4253cb757a6073955d62d9e1f25
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Oct 9 13:18:42 2009 +0200

    Switch to dh-ocaml 0.9 and simplify rules

diff --git a/debian/control b/debian/control
index bb97185..8ae5186 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,11 @@ Uploaders:
  Mike Furr <mfurr at debian.org>,
  Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 7.2.11~),
  libperl-dev,
- ocaml-nox (>= 3.11),
- quilt,
- dh-ocaml
+ ocaml-nox (>= 3.11.1-3~),
+ quilt (>= 0.46-7~),
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
 Homepage: http://merjis.com/developers/perl4caml
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/perl4caml.git
@@ -18,15 +18,22 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/perl4caml.git
 
 Package: libperl4caml-ocaml-dev
 Architecture: any
-Suggests: libperl4caml-ocaml-doc, libwww-perl, libcrypt-ssleay-perl, libtimedate-perl, libwww-mechanize-perl
+Suggests:
+ libperl4caml-ocaml-doc,
+ libwww-perl,
+ libcrypt-ssleay-perl,
+ libtimedate-perl,
+ libwww-mechanize-perl
 Depends:
- libperl4caml-ocaml (= ${binary:Version}),
  libnet-google-perl,
  libhtml-tree-perl,
  liburi-perl,
  libtemplate-perl,
- libdate-calc-perl, 
+ libdate-calc-perl,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: Use Perl code in OCaml programs, development files
  perl4caml allows you to use Perl code within Objective CAML (OCaml),
  thus neatly side-stepping the old problem with OCaml which was that it
@@ -38,7 +45,11 @@ Description: Use Perl code in OCaml programs, development files
 
 Package: libperl4caml-ocaml
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ocaml-base-nox-${F:OCamlABI}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: Use Perl code in OCaml programs, runtime library
  perl4caml allows you to use Perl code within Objective CAML (OCaml),
  thus neatly side-stepping the old problem with OCaml which was that it
diff --git a/debian/rules b/debian/rules
index bf1161f..0768179 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,14 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-include /usr/share/ocaml/ocamlinit.mk
-include /usr/share/quilt/quilt.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PACKAGES := $(shell awk '/Package:/{print $$2}' debian/control)
+%:
+	dh --with quilt,ocaml $@
 
-build: patch ocamlinit
-	dh $@
-
-clean: unpatch ocamlinit-clean
-	dh $@
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -Rf html
 
-substvar-stamp:
-	dh_prep
-	for u in $(PACKAGES); do \
-  	  echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \
-	done
-	touch $@
-
-binary-indep: substvar-stamp
-	dh $@
-
-binary-arch: substvar-stamp
-	dh $@
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install

-- 
perl4caml packaging