[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, master, updated. debian/4.1-1-10-gd0f5983

[Eric Cooper]

The following commit has been merged in the master branch:
commit 3865ad369cb2b0080763c656cdff857c1581e90f
Author: Eric Cooper <ecc at cmu.edu>
Date:   Fri Sep 18 15:09:02 2009 -0400

    use dh-ocaml 0.9
    
    update build-deps
    
    drop lsb-base dependency
    
    simplify debian/rules

diff --git a/debian/control b/debian/control
index 04aa474..d1b0149 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,15 @@ Priority: optional
 Maintainer: Eric Cooper <ecc at cmu.edu>
 Uploaders: Sylvain Le Gall <gildor at debian.org>, Ralf Treinen <treinen at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0), cdbs, dh-ocaml, ocaml-nox (>= 3.11), ocaml-best-compilers, libnethttpd-ocaml-dev (>= 2.2.9), libpcre-ocaml-dev (>= 5.15), libsha-ocaml-dev (>= 1.5), libsyslog-ocaml-dev (>= 1.4)
+Build-Depends:
+ ocaml-nox (>= 3.11),
+ libnethttpd-ocaml-dev (>= 2.2.9),
+ libpcre-ocaml-dev (>= 6.0),
+ libsha-ocaml-dev (>= 1.6),
+ libsyslog-ocaml-dev (>= 1.4),
+ debhelper (>= 7.0),
+ cdbs (>= 0.4.62),,
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/approx.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/approx.git
@@ -12,7 +20,15 @@ Homepage: http://git.debian.org/?p=pkg-ocaml-maint/packages/approx.git
 
 Package: approx
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${F:OCamlDeps}, lsb-base (>= 3.2), adduser, bzip2, curl, openbsd-inetd | inet-superserver, update-inetd
+Depends:
+ ${ocaml:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends},
+ adduser,
+ bzip2,
+ curl,
+ openbsd-inetd | inet-superserver,
+ update-inetd
 Description: caching proxy server for Debian archive files
  Approx is an HTTP-based proxy server for Debian-style package archives.
  It fetches files from remote repositories on demand,
diff --git a/debian/rules b/debian/rules
index ded4bea..65d59f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,9 @@
 #!/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/ocaml.mk
+include /usr/share/cdbs/1/class/makefile.mk
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),no)
     DEB_MAKE_BUILD_TARGET = TARGET=byte
-    libs_with_stubs := ocamlnet pcre sha syslog
-    comma := ,
-    libdeps := $(patsubst %,lib%-ocaml$(comma),$(libs_with_stubs))
-    DEB_DH_GENCONTROL_ARGS += -VF:OCamlDeps="ocaml-base-nox-$(OCAML_ABI), $(libdeps)"
 endif

-- 
approx upstream and debian packaging