[Pkg-ocaml-maint-commits] [SCM] ocaml-sqlite3 packaging branch, master, updated. debian/1.5.1-1-1-g1a62e4a

Sun Jul 26 11:26:33 UTC 2009

The following commit has been merged in the master branch:
commit 1a62e4a07ec14d1a9f4dee0552c1144be5f2d9ac
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Jul 26 13:23:17 2009 +0200

    Adapt to new dh-ocaml, switch debian/rules to dh

diff --git a/debian/changelog b/debian/changelog
index 9e026e8..e27ad38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml-sqlite3 (1.5.1-2) UNRELEASED; urgency=low
+
+  * Adapt to new dh-ocaml
+  * Convert debian/rules to dh
+
+ -- Stephane Glondu <steph at glondu.net>  Sun, 26 Jul 2009 12:16:05 +0200
+
 ocaml-sqlite3 (1.5.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index f1a05eb..96c45cc 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Stephane Glondu <steph at glondu.net>
 DM-Upload-Allowed: yes
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 7.0.52),
  dpkg-dev (>= 1.13.19),
- quilt,
+ quilt (>= 0.46-7),
  ocaml-nox (>= 3.11),
  camlp4 (>= 3.11),
  libsqlite3-dev (>= 3.3.9),
  ocaml-findlib (>> 1.2.4-2),
- dh-ocaml (>= 0.2)
+ dh-ocaml (>= 0.9)
 Standards-Version: 3.8.2
 Section: ocaml
 Homepage: http://ocaml.info/home/ocaml_sources.html#ocaml-sqlite3
@@ -20,7 +20,11 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-sqlite3.git
 
 Package: libsqlite3-ocaml
 Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Depends:
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Replaces: libsqlite3-ocaml-dev (<< 1.4.0-2)
 Conflicts: libsqlite3-ocaml-dev (<< 1.4.0-2)
 Description: Embeddable SQL Database for OCaml Programs
@@ -34,7 +38,12 @@ Description: Embeddable SQL Database for OCaml Programs
 
 Package: libsqlite3-ocaml-dev
 Architecture: any
-Depends: ocaml-nox-${F:OCamlABI}, libsqlite3-dev (>= 3.3.5), libsqlite3-ocaml (= ${binary:Version})
+Depends:
+ libsqlite3-dev,
+ ${ocaml:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
 Description: Embeddable SQL Database for OCaml Programs
  This package provides an interface for the SQLite3 embeddable SQL
diff --git a/debian/libsqlite3-ocaml.install.in b/debian/libsqlite3-ocaml.install.in
index d86fc2c..fcd2f39 100644
--- a/debian/libsqlite3-ocaml.install.in
+++ b/debian/libsqlite3-ocaml.install.in
@@ -1,4 +1,4 @@
- at OCamlStdlibDir@/sqlite3/dllsqlite3_stubs.so @OCamlDllDir@
+ at OCamlDllDir@/*.so
 @OCamlStdlibDir@/sqlite3/sqlite3.cma
 @OCamlStdlibDir@/sqlite3/META
 OPT: sqlite3.cmxs @OCamlStdlibDir@/sqlite3
diff --git a/debian/rules b/debian/rules
index b660da5..bdf9218 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,87 +1,34 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/ocaml/ocamlinit.mk
 
 DESTDIR := $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+	dh --with quilt,ocaml $@
 
-CFLAGS = -Wall -g
+.PHONY: override_dh_auto_configure
+override_dh_auto_configure:
+	dh_auto_configure -- LDFLAGS="-Wl,-z,defs"
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-build: ocamlinit patch build-stamp
-build-stamp: config.status
-	dh_testdir
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	$(MAKE) bytecode docs
 ifneq ($(OCAML_OPT_ARCH),)
 	$(MAKE) opt
 	ocamlopt -I . -shared -linkall -o sqlite3.cmxs sqlite3.cmxa
 endif
-	touch $@
-
-clean: unpatch ocamlinit-clean
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) clean
-	rm -f META
-	rm -f config.status config.log Makefile
-	rm -rf doc
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+.PHONY: override_dh_auto_clean
+override_dh_auto_clean:
+	[ ! -f Makefile ] || $(MAKE) distclean
 
-	mkdir -p $(DESTDIR)
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+	mkdir -p $(CURDIR)/debian/tmp$(OCAML_DLL_DIR)
 	mkdir -p $(CURDIR)/debian/tmp/usr/bin
 	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs Changelog
-	dh_installdocs
-	dh_installexamples
-	dh_install --list-missing
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol -- -VF:OCamlABI="$(OCAML_ABI)"
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch

-- 
ocaml-sqlite3 packaging

