[Pkg-ocaml-maint-commits] [SCM] findlib packaging branch, master, updated. debian/1.2.3-1-17-gbbca517

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit bbca517f7179c20d91a9f5ec3c3b991e15545534
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Sun Feb 22 18:19:45 2009 +0100

    debian/rules: invoke ocaml.mk as a "rules" snippet

diff --git a/debian/changelog b/debian/changelog
index 43c0e7a..ee90ab1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 findlib (1.2.4-1) UNRELEASED; urgency=low
 
+  [ Stephane Glondu ]
   * New Upstream Version
   * Update patches:
     - remove natdynlink (merged upstream)
@@ -8,7 +9,11 @@ findlib (1.2.4-1) UNRELEASED; urgency=low
   * Remove versioned dependencies on ocaml
   * Bump debhelper compatibility to 7 (no changes)
 
- -- Stephane Glondu <steph at glondu.net>  Mon, 16 Feb 2009 08:08:58 +0100
+  [ Stefano Zacchiroli ]
+  * debian/rules: invoke ocaml.mk as a "rules" snippet
+  * debian/control: version build-dep on dh-ocaml to 0.4
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 22 Feb 2009 18:19:12 +0100
 
 findlib (1.2.3-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 93abf15..faa246c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: findlib
 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>
 Build-Depends:
  debhelper (>= 7),
  ocaml,
@@ -11,7 +13,7 @@ Build-Depends:
  gawk | awk,
  dpatch,
  cdbs,
- dh-ocaml
+ dh-ocaml (>= 0.4)
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/findlib.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/findlib.git
@@ -20,7 +22,10 @@ Homepage: http://projects.camlcity.org/projects/findlib.html
 Package: ocaml-findlib
 Section: devel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ocaml-nox-${F:OCamlABI},
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: Management tool for OCaml programming language libraries
  The "findlib" OCaml library provides a scheme to manage reusable
  software components (packages), and includes tools that support this
diff --git a/debian/rules b/debian/rules
index ea0c029..8b12d6b 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 = ocaml-findlib
 DEB_MAKE_INSTALL_TARGET = install prefix=$(CURDIR)/debian/tmp

-- 
findlib packaging