[Pkg-ocaml-maint-commits] [SCM] ocamlgsl packaging branch, master, updated. debian/0.6.0-4

[Sylvain Le Gall]

The following commit has been merged in the master branch:
commit 6b29d0c75b36688c1b3df6366c53247f9571d13b
Author: Sylvain Le Gall <gildor at debian.org>
Date:   Sat Mar 7 16:38:13 2009 +0100

    Migration to OCaml 3.11
    
    * Set maintainer to Debian OCaml Maintainers
    * Add dh-ocaml build-dependency (rules/ocaml.mk)
    * Add ${misc:Depends} to dependencies

diff --git a/debian/changelog b/debian/changelog
index 9ce9b5d..44e6e18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-ocamlgsl (0.6.0-4) UNRELEASED; urgency=low
+ocamlgsl (0.6.0-4) unstable; urgency=low
 
-  * NOT RELEASED YET
   * Switch packaging to git
+  * Set maintainer to Debian OCaml Maintainers
+  * Add dh-ocaml build-dependency (rules/ocaml.mk)
+  * Add ${misc:Depends} to dependencies
 
  -- Sylvain Le Gall <gildor at debian.org>  Thu, 05 Mar 2009 11:05:09 +0100
 
diff --git a/debian/control b/debian/control
index 2559b29..596711f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,17 @@
 Source: ocamlgsl
 Section: devel
 Priority: optional
-Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), 
- dpatch, ocaml-nox (>= 3.10.0-9), ocaml-findlib (>= 1.1.2pl1-4), 
- libgsl0-dev, chrpath, gawk, camlp4 (>= 3.10.0)
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Sylvain Le Gall <gildor at debian.org>
+Build-Depends: cdbs (>= 0.4.23-1.1), 
+ debhelper (>= 5), 
+ dpatch, 
+ ocaml-nox (>= 3.10.0-9), 
+ ocaml-findlib (>= 1.1.2pl1-4), 
+ libgsl0-dev, 
+ chrpath, 
+ gawk, 
+ camlp4 (>= 3.10.0)
 Standards-Version: 3.8.0
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamlgsl.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamlgsl.git
@@ -13,7 +20,7 @@ Homepage: http://oandrieu.nerim.net/ocaml/
 Package: libocamlgsl-ocaml-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlgsl-ocaml (= ${binary:Version}), libgsl0-dev
+Depends: ${shlibs:Depends}, ocaml-nox-${F:OCamlABI}, libocamlgsl-ocaml (= ${binary:Version}), libgsl0-dev, ${misc:Depends}
 Description: GNU scientific library for OCaml
  This is an interface to GSL (GNU scientific library), for the
  Objective Caml language.
@@ -23,7 +30,7 @@ Description: GNU scientific library for OCaml
 Package: libocamlgsl-ocaml
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}
+Depends: ${shlibs:Depends}, ocaml-base-nox-${F:OCamlABI}, ${misc:Depends}
 Description: GNU scientific library for OCaml
  This is an interface to GSL (GNU scientific library), for the
  Objective Caml language.
diff --git a/debian/rules b/debian/rules
index 27c5794..16317d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/class/ocaml.mk
+include /usr/share/cdbs/1/rules/ocaml.mk
 
 DEB_MAKE_CLEAN_TARGET    := clean
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
@@ -41,13 +41,8 @@ DEB_MAKE_INSTALL_TARGET += DESTDIR="$(DESTDIR_DEV)"
 
 OCAML_OCAMLDOC_PACKAGES_DOCBASE := libocamlgsl-ocaml-dev
 
-clean::
-	-$(RM) "$(CURDIR)/debian/libocamlgsl-ocaml-dev.doc-base.ocamldoc-apiref"
-	-$(RM) "$(CURDIR)/debian/libocamlgsl-ocaml-dev.install"
-	-$(RM) "$(CURDIR)/debian/libocamlgsl-ocaml.dirs"
-
 install/libocamlgsl-ocaml-dev::
-	$(RM) -r $(DESTDIR_DEV)/$(OCAML_DLL_DIR)
+	$(RM) -r '$(DESTDIR_DEV)/$(OCAML_DLL_DIR)'
 	mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gsl/*.so \
-	 $(DESTDIR)/$(OCAML_DLL_DIR)
+	 '$(DESTDIR)/$(OCAML_DLL_DIR)'
 	chrpath -d $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/*.so

-- 
ocamlgsl packaging