[Pkg-ocaml-maint-commits] [SCM] ocaml-text packaging branch, master, updated. debian/0.2-2-4-gd715240

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 04a4e7c038df97977f6026d53b84f56470aaaed0
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 14 00:02:04 2009 +0200

    Switch packaging to dh-ocaml 0.9

diff --git a/debian/control b/debian/control
index f2afee5..b478dba 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stéphane Glondu <glondu at debian.org>
 Build-Depends:
- debhelper (>= 7.0.52),
- quilt (>= 0.46-7),
- dh-ocaml,
+ debhelper (>= 7.2.11~),
+ quilt (>= 0.46-7~),
+ dh-ocaml (>= 0.9),
  ocaml-findlib,
- ocaml-nox (>= 3.11)
-Standards-Version: 3.8.2
+ ocaml-nox (>= 3.11.1-3~)
+Standards-Version: 3.8.3
 Section: ocaml
 Homepage: http://ocaml-text.forge.ocamlcore.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-text.git
@@ -17,10 +17,10 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-text.git
 Package: libtext-ocaml-dev
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
- libtext-ocaml,
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Description: library for dealing with sequences of Unicode characters
  OCaml-Text is an OCaml library for dealing with "text", i.e. sequences
@@ -41,9 +41,10 @@ Description: library for dealing with sequences of Unicode characters
 Package: libtext-ocaml
 Architecture: any
 Depends:
- ocaml-base-nox-${F:OCamlABI},
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
+Provides: ${ocaml:Provides}
 Description: runtime libraries of OCaml-Text
  OCaml-Text is an OCaml library for dealing with "text", i.e. sequences
  of Unicode characters, in a convenient way.
diff --git a/debian/rules b/debian/rules
index f0e472e..e2b6e0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-include /usr/share/ocaml/ocamlinit.mk
+include /usr/share/ocaml/ocamlvars.mk
 
 export OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
 %:
-	dh --with quilt $@
-
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure: ocamlinit-stamp $(QUILT_STAMPFN)
-
-.PHONY: override_dh_auto_clean
-override_dh_auto_clean: ocamlinit-clean
-	make clean
-
-.PHONY: override_dh_gencontrol
-override_dh_gencontrol:
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
+	dh --with quilt,ocaml $@
 
 .PHONY: override_dh_installchangelogs
 override_dh_installchangelogs:
@@ -37,9 +26,3 @@ override_dh_auto_build:
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	cd _build && ocamlopt -shared -I src -o text.cmxs text.cmxa
 endif
-
-.PHONY: redo-patches
-redo-patches:
-	rm -f debian/patches/*
-	git format-patch -N -o debian/patches upstream...patch-queue | \
-	  sed -e 's%debian/patches/%%' > debian/patches/series

-- 
ocaml-text packaging