[Pkg-ocaml-maint-commits] [SCM] dose2 packaging branch, master, updated. debian/1.4.2-1-11-g4fb8762

[Ralf Treinen]

The following commit has been merged in the master branch:
commit f4ba05e7a5e80b047d1a4b0a9e17c976896423a2
Author: Ralf Treinen <treinen at free.fr>
Date:   Thu Feb 10 07:56:07 2011 +0100

    rely on dh_ocaml fro dependencies

diff --git a/debian/control b/debian/control
index 970691e..b866581 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,8 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Stefano Zacchiroli <zack at debian.org>,
  Ralf Treinen <treinen at debian.org>
 Build-Depends: debhelper (>= 7), dh-ocaml (>= 0.9.0),
- ocaml-nox (>=3.11.1-3~), camlp4,
- ocaml-findlib, menhir,
- librpm-dev,
- libpcre-ocaml-dev,
- libcalendar-ocaml-dev,
+ ocaml-nox (>=3.11.1-3~), camlp4, ocaml-findlib, menhir,
+ librpm-dev, libpcre-ocaml-dev, libcalendar-ocaml-dev,
  libzip-ocaml-dev, libbz2-ocaml-dev
 Standards-Version: 3.8.4
 Homepage: http://sodiac.gforge.inria.fr/
@@ -18,13 +15,9 @@ Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/dose2.git
 
 Package: libdose2-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
- libdose2-ocaml (= ${binary:Version}),
- libpcre-ocaml-dev,
- libcalendar-ocaml-dev,
- libzip-ocaml-dev, libbz2-ocaml-dev, 
- librpm-dev,
- libgdbm-dev,
+Depends: ${ocaml:Depends}, ocaml-findlib,
+ libpcre-ocaml-dev, libcalendar-ocaml-dev,
+ libzip-ocaml-dev, libbz2-ocaml-dev, librpm-dev, libgdbm-dev,
  ${misc:Depends}
 Description: OCaml libraries for package dependencies (development files)
  Dose2 is a framework made of several OCaml libraries for managing
@@ -46,9 +39,7 @@ Description: OCaml libraries for package dependencies (development files)
 
 Package: libdose2-ocaml
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib,
- libpcre-ocaml,
- libzip-ocaml, libbz2-ocaml,
+Depends: ${ocaml:Depends}, ocaml-findlib,
  ${shlibs:Depends}, ${misc:Depends}
 Description: OCaml libraries for managing packages and their dependencies
  Dose2 is a framework made of several OCaml libraries for managing
diff --git a/debian/rules b/debian/rules
index 87f2d0f..b577480 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,3 @@
 
 %:
 	dh $@ --with ocaml
-
-#include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/class/makefile.mk
-#include /usr/share/cdbs/1/rules/ocaml.mk
-
-#LIB_NAME = dose2
-#DLL_PKG_NAME = lib$(LIB_NAME)-ocaml
-#DEV_PKG_NAME = lib$(LIB_NAME)-ocaml-dev
-#DEB_MAKE_BUILD_TARGET = depend all
-#DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(DEV_PKG_NAME)$(OCAML_STDLIB_DIR)
-
-#configure/$(DEV_PKG_NAME):: debian/configure-stamp
-
-#debian/configure-stamp:#
-#	./configure
-#touch $@
-
-#clean::
-#	rm -f debian/configure-stamp
-
-#OCAML_OCAMLDOC_PACKAGES = $(OCAML_LIBDEV_PACKAGES)

-- 
dose2 packaging