[Pkg-ocaml-maint-commits] [SCM] sexplib310 packaging branch, master, updated. debian/4.2.11-2-8-gfa8ce1d

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit 56e4f61087e84ded15edcfa17eda65c70c7084e9
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Mon Nov 9 14:00:10 2009 +0100

    Switch packaging to dh-ocaml

diff --git a/debian/changelog b/debian/changelog
index 936fd60..70ff549 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ sexplib310 (4.2.16-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Get rid of topgit, packaging now uses plain old quilt
+  * Switch packaging to dh-ocaml
 
  -- Stefano Zacchiroli <zack at debian.org>  Mon, 09 Nov 2009 13:48:49 +0100
 
diff --git a/debian/control b/debian/control
index 601b4d3..9ec93ab 100644
--- a/debian/control
+++ b/debian/control
@@ -14,20 +14,21 @@ Build-Depends:
  camlp4,
  camlp4-extra,
  libtype-conv-camlp4-dev (>> 1.6.7-2),
- dh-ocaml (>= 0.4)
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.2
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/sexplib310.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/sexplib310.git
 Homepage: http://www.ocaml.info/home/ocaml_sources.html#sexplib310
 
 Package: libsexplib-camlp4-dev
-Provides: libsexplib-ocaml-dev
+Provides:
+ libsexplib-ocaml-dev,
+ ${ocaml:Provides}
 Architecture: any
 Depends:
- ocaml-nox-${F:OCamlABI},
  ocaml-findlib,
  camlp4,
- libtype-conv-camlp4-dev,
+ ${ocaml:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
 Description: automated conversions between OCaml-values and S-expressions
diff --git a/debian/rules b/debian/rules
index 4bb9e17..85ed92f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,10 @@ include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
--include /usr/share/topgit/tg2quilt.mk
 
 LIB_NAME = sexplib
 PKG_NAME = lib$(LIB_NAME)-camlp4-dev
 DESTDIR = $(CURDIR)/debian/$(PKG_NAME)$(OCAML_STDLIB_DIR)
-QUILT_PATCH_DIR ?= debian/patches	# can be removed once #513952 gets fixed
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 DEB_MAKE_BUILD_TARGET = all

-- 
sexplib310 packaging