[Pkg-ocaml-maint-commits] [SCM] pcre-ocaml packaging branch, master, updated. debian/5.15.1-1-2-g32e55e5

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 32e55e5d1dbce7e444bda9b084add3eeb166496c
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Tue Feb 24 14:21:49 2009 +0100

    port to latest dh-ocaml
    
    * debian/rules: use ocaml.mk as a "rules" makefile snippet, bump
      build-dep on dh-ocaml to the minumum version implementing it
    * debian/control: drop obsolete dep version requirements

diff --git a/debian/changelog b/debian/changelog
index 6c9004f..edd1e0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ pcre-ocaml (5.15.1-2) UNRELEASED; urgency=low
     - simplify debian/*.install file getting rid of debian/tmp/
   * debian/*.install.in: use @OCamlStdlibDir@ and @OCamlDllDir@ instead of
     making assumption on stdlib directory layout
+  * debian/rules: use ocaml.mk as a "rules" makefile snippet, bump
+    build-dep on dh-ocaml to the minumum version implementing it
+  * debian/control: drop obsolete dep version requirements
 
  -- Stefano Zacchiroli <zack at debian.org>  Fri, 20 Feb 2009 23:37:11 +0100
 
diff --git a/debian/control b/debian/control
index 455ad44..aa6952c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: pcre-ocaml
 Section: devel
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Stefano Zacchiroli <zack at debian.org>, Stephane Glondu <steph at glondu.net>
+Uploaders:
+ Stefano Zacchiroli <zack at debian.org>,
+ Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
 Build-Depends:
  debhelper (>= 7.0.0),
@@ -11,7 +13,7 @@ Build-Depends:
  ocaml-findlib,
  cdbs,
  dpatch,
- dh-ocaml
+ dh-ocaml (>= 0.4)
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pcre-ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pcre-ocaml.git
@@ -20,7 +22,10 @@ Homepage: http://www.ocaml.info/home/ocaml_sources.html
 Package: libpcre-ocaml
 Architecture: any
 Section: libs
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ocaml-base-nox-${F:OCamlABI},
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: OCaml bindings for PCRE (Perl Compatible Regular Expression)
  This OCaml-library interfaces the PCRE (Perl-compatibility
  regular expressions) C library. it can be used for matching
@@ -40,7 +45,12 @@ Description: OCaml bindings for PCRE (Perl Compatible Regular Expression)
 Package: libpcre-ocaml-dev
 Architecture: any
 Section: libdevel
-Depends: ocaml-nox-${F:OCamlABI}, libpcre3-dev (>= 4.5), libpcre-ocaml (= ${binary:Version}), ocaml-findlib (>= 1.1), ${misc:Depends}
+Depends:
+ ocaml-nox-${F:OCamlABI},
+ libpcre-ocaml (= ${binary:Version}),
+ libpcre3-dev,
+ ocaml-findlib,
+ ${misc:Depends}
 Description: OCaml bindings for PCRE (Perl Compatible Regular Expression)
  This OCaml-library interfaces the PCRE (Perl-compatibility
  regular expressions) C library. it can be used for matching
diff --git a/debian/rules b/debian/rules
index ef824c7..9363eab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 PKGNAME = libpcre-ocaml-dev
 DESTDIR := $(CURDIR)/debian/tmp$(OCAML_STDLIB_DIR)

-- 
pcre-ocaml packaging