[Pkg-ocaml-maint-commits] [SCM] galax packaging branch, master, updated. debian/1.1-4-1-g806df45

[Stefano Zacchiroli]

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

    update packaging for OCaml 3.11

diff --git a/debian/changelog b/debian/changelog
index 9b852a6..0efd7e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+galax (1.1-5) UNRELEASED; urgency=low
+
+  * rebuild against OCaml 3.11, bump build-dependencies accordingly
+  * bump debhelper compatibility level to 7
+  * debian/control
+    - add build-dependency on dh-ocaml, which ships the CDBS class
+    - make consistent the indentation of dependency fields
+  * debian/rules
+    - use ocaml.mk class as a "rules" file, as now is
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 22 Feb 2009 18:08:40 +0100
+
 galax (1.1-4) unstable; urgency=medium
 
   * bump Standards-Version to 3.8.0 (no changes needed)
diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
index 8ae65df..9f255a2 100644
--- a/debian/control
+++ b/debian/control
@@ -2,15 +2,20 @@ Source: galax
 Section: text
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: cdbs, debhelper (>= 6),
+Build-Depends:
+ debhelper (>= 7),
+ cdbs,
+ dh-ocaml (>= dh-ocaml 0.4),
  dpatch,
- ocaml-nox (>= 3.10.1), camlp4,
+ ocaml-nox (>= 3.11),
+ camlp4,
  libpcre-ocaml-dev,
  libocamlnet-ocaml-dev,
  libpxp-ocaml-dev,
  libcamomile-ocaml-dev,
  hevea,
- texlive-latex-base, texlive-latex-extra
+ texlive-latex-base,
+ texlive-latex-extra
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/galax.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/galax.git
@@ -18,7 +23,9 @@ Homepage: http://www.galaxquery.org
 
 Package: galax
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
  ${F:OCamlInterp},
  libcamomile-ocaml-data
 Description: XQuery implementation with static typing - command line front-ends
@@ -40,7 +47,9 @@ Description: XQuery implementation with static typing - command line front-ends
 
 Package: galax-extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
  ${F:OCamlInterp},
  libcamomile-ocaml-data
 Recommends: galax
@@ -66,7 +75,9 @@ Description: XQuery implementation with static typing - utilities
 Package: galaxd
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
  ${F:OCamlInterp},
  libcamomile-ocaml-data
 Suggests: galax
@@ -91,12 +102,14 @@ Description: XQuery implementation with static typing - network servers
 Package: libgalax-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI},
+Depends:
+ ocaml-nox-${F:OCamlABI},
  libpcre-ocaml-dev,
  libocamlnet-ocaml-dev,
  libpxp-ocaml-dev,
  libcamomile-ocaml-dev,
- ${shlibs:Depends}, ${misc:Depends}
+ ${shlibs:Depends},
+ ${misc:Depends}
 Description: XQuery implementation with static typing - OCaml libraries
  Galax is an implementation of XQuery, the W3C XML Query Language.
  .
@@ -117,7 +130,8 @@ Description: XQuery implementation with static typing - OCaml libraries
 Package: galax-doc
 Section: doc
 Architecture: all
-Suggests: galax,
+Suggests:
+ galax,
  libgalax-ocaml-dev
 Description: XQuery implementation with static typing - documentation
  Galax is an implementation of XQuery, the W3C XML Query Language.
diff --git a/debian/rules b/debian/rules
index c3d376c..0deaef5 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 = galax
 DEB_MAKE_BUILD_TARGET = world

-- 
galax packaging