[Pkg-ocaml-maint-commits] r2326 - in
trunk/packages/ocaml-sqlite/trunk/debian: . patches
Samuel Mimram
smimram at costa.debian.org
Mon Dec 26 14:58:43 UTC 2005
Author: smimram
Date: 2005-12-26 14:58:42 +0000 (Mon, 26 Dec 2005)
New Revision: 2326
Added:
trunk/packages/ocaml-sqlite/trunk/debian/Makefile
trunk/packages/ocaml-sqlite/trunk/debian/libsqlite-ocaml-dev.install.in
trunk/packages/ocaml-sqlite/trunk/debian/libsqlite-ocaml.install.in
Removed:
trunk/packages/ocaml-sqlite/trunk/debian/control.in
trunk/packages/ocaml-sqlite/trunk/debian/dirs
Modified:
trunk/packages/ocaml-sqlite/trunk/debian/changelog
trunk/packages/ocaml-sqlite/trunk/debian/control
trunk/packages/ocaml-sqlite/trunk/debian/patches/00list
trunk/packages/ocaml-sqlite/trunk/debian/rules
Log:
Cleaner packaging.
Added: trunk/packages/ocaml-sqlite/trunk/debian/Makefile
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/Makefile 2005-12-25 23:03:07 UTC (rev 2325)
+++ trunk/packages/ocaml-sqlite/trunk/debian/Makefile 2005-12-26 14:58:42 UTC (rev 2326)
@@ -0,0 +1,20 @@
+SOURCES = sqlite_stubs.c sqlite.mli sqlite.ml
+RESULT = sqlite
+CLIBS = sqlite
+
+OCAMLMAKEFILE = /usr/share/ocaml-tools/OCamlMakefile
+
+all: docs bcl sqlitetop
+
+allopt: all ncl
+
+install: libinstall
+
+docs:
+ if [ ! -d doc ]; then mkdir doc; fi
+ ocamldoc -html -d doc sqlite.mli
+
+sqlitetop:
+ ocamlmktop -I . -o sqlitetop sqlite.cma
+
+-include $(OCAMLMAKEFILE)
Modified: trunk/packages/ocaml-sqlite/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/changelog 2005-12-25 23:03:07 UTC (rev 2325)
+++ trunk/packages/ocaml-sqlite/trunk/debian/changelog 2005-12-26 14:58:42 UTC (rev 2326)
@@ -1,3 +1,11 @@
+ocaml-sqlite (0.3.5.arch.4-6) unstable; urgency=low
+
+ * Cleaner packaging.
+ * Using OCamlMakefile to build the library instead of patching the makefile,
+ which solves the linking problem in native mode, closes: #335651.
+
+ -- Samuel Mimram <smimram at debian.org> Mon, 26 Dec 2005 15:04:33 +0100
+
ocaml-sqlite (0.3.5.arch.4-5) unstable; urgency=low
* Rebuild with OCaml 3.09.0.
Modified: trunk/packages/ocaml-sqlite/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/control 2005-12-25 23:03:07 UTC (rev 2325)
+++ trunk/packages/ocaml-sqlite/trunk/debian/control 2005-12-26 14:58:42 UTC (rev 2326)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autoconf (>= 2.50), libsqlite0-dev (>= 2.8.1), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.0.4-1), dpatch
+Build-Depends: debhelper (>= 4.0.0), autoconf (>= 2.50), libsqlite0-dev (>= 2.8.1), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.0.4-1), dpatch, ocaml-tools
Standards-Version: 3.6.2
Package: libsqlite-ocaml-dev
Deleted: trunk/packages/ocaml-sqlite/trunk/debian/control.in
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/control.in 2005-12-25 23:03:07 UTC (rev 2325)
+++ trunk/packages/ocaml-sqlite/trunk/debian/control.in 2005-12-26 14:58:42 UTC (rev 2326)
@@ -1,32 +0,0 @@
-Source: ocaml-sqlite
-Section: libdevel
-Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
-Uploaders: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autoconf (>= 2.50), libsqlite0-dev (>= 2.8.1), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.0.4-1), dpatch
-Standards-Version: 3.6.2
-
-Package: libsqlite-ocaml-dev
-Architecture: any
-Depends: libsqlite-ocaml (= ${Source-Version}), ocaml-nox-${F:OCamlABI}, libsqlite0-dev
-Description: Embeddable SQL Database for OCaml Programs
- This package provides an interface for the SQLite embeddable SQL
- database. It allows your OCaml programs to use a SQL database without
- depending on any external software; the resulting system can be
- entirely self-contained.
- .
- This package provides the files necessary to develop new applications that
- use SQLite for OCaml.
-
-Package: libsqlite-ocaml
-Section: libs
-Architecture: any
-Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
-Description: Embeddable SQL Database for OCaml Programs
- This package provides an interface for the SQLite embeddable SQL
- database. It allows your OCaml programs to use a SQL database without
- depending on any external software; the resulting system can be
- entirely self-contained.
- .
- This package provides the files necessary to run dynamically-linked
- OCaml programs with SQLite.
Deleted: trunk/packages/ocaml-sqlite/trunk/debian/dirs
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/dirs 2005-12-25 23:03:07 UTC (rev 2325)
+++ trunk/packages/ocaml-sqlite/trunk/debian/dirs 2005-12-26 14:58:42 UTC (rev 2326)
@@ -1 +0,0 @@
-usr/bin
Added: trunk/packages/ocaml-sqlite/trunk/debian/libsqlite-ocaml-dev.install.in
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/libsqlite-ocaml-dev.install.in 2005-12-25 23:03:07 UTC (rev 2325)
+++ trunk/packages/ocaml-sqlite/trunk/debian/libsqlite-ocaml-dev.install.in 2005-12-26 14:58:42 UTC (rev 2326)
@@ -0,0 +1,5 @@
+usr/bin/sqlitetop
+usr/lib/ocaml/@OCamlABI@/sqlite/META
+usr/lib/ocaml/@OCamlABI@/sqlite/*.a
+usr/lib/ocaml/@OCamlABI@/sqlite/*.cm*
+usr/lib/ocaml/@OCamlABI@/sqlite/*.ml*
Added: trunk/packages/ocaml-sqlite/trunk/debian/libsqlite-ocaml.install.in
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/libsqlite-ocaml.install.in 2005-12-25 23:03:07 UTC (rev 2325)
+++ trunk/packages/ocaml-sqlite/trunk/debian/libsqlite-ocaml.install.in 2005-12-26 14:58:42 UTC (rev 2326)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/sqlite/dllsqlite_stubs.so usr/lib/ocaml/@OCamlABI@/stublibs/
Modified: trunk/packages/ocaml-sqlite/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/patches/00list 2005-12-25 23:03:07 UTC (rev 2325)
+++ trunk/packages/ocaml-sqlite/trunk/debian/patches/00list 2005-12-26 14:58:42 UTC (rev 2326)
@@ -1 +0,0 @@
-makefile
Modified: trunk/packages/ocaml-sqlite/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/rules 2005-12-25 23:03:07 UTC (rev 2325)
+++ trunk/packages/ocaml-sqlite/trunk/debian/rules 2005-12-26 14:58:42 UTC (rev 2326)
@@ -10,14 +10,15 @@
include /usr/share/dpatch/dpatch.make
OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
+DESTDIR = $(CURDIR)/debian/tmp/$(shell ocamlc -where)
+
# 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)
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -36,10 +37,11 @@
dh_testdir
autoconf
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+ cp debian/Makefile .
-build: patch-stamp build-stamp
-build-stamp: config.status
+build: ocamlinit patch-stamp build-stamp
+build-stamp: config.status
dh_testdir
if [ -x /usr/bin/ocamlopt ]; then $(MAKE) allopt; else $(MAKE) all; fi
@@ -61,31 +63,22 @@
-rm -f config.log Makefile configure META
-rm -rf doc
- -rm debian/libsqlite-ocaml.files
dh_clean
-DESTDIR=$(CURDIR)/debian/libsqlite-ocaml-dev
install: build
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
- echo `ocamlc -where` | sed -e 's.^/..' -e 's.$$./*.' > debian/libsqlite-ocaml.files
- mkdir -p debian/libsqlite-ocaml-dev/`ocamlc -where`/stublibs
- mkdir -p debian/libsqlite-ocaml/`ocamlc -where`
- if [ -x /usr/bin/ocamlopt ]; then \
- $(MAKE) installopt DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore; \
- else \
- $(MAKE) install DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore; \
- fi
- #cp dll*.so debian/libsqlite-ocaml-dev/`ocamlc -where`/stublibs/
- mv $(DESTDIR)/`ocamlc -where`/stublibs debian/libsqlite-ocaml/`ocamlc -where`/
- rm -f debian/libsqlite-ocaml/`ocamlc -where`/stublibs/dllsqlite.so.owner
- mv $(DESTDIR)/usr/bin/ debian/libsqlite-ocaml/usr
+ mkdir -p $(DESTDIR)
+ mkdir -p debian/tmp/usr/bin
+ make install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
+ cp sqlitetop debian/tmp/usr/bin
+
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -97,7 +90,7 @@
dh_installchangelogs CHANGES
dh_installdocs
dh_installexamples
- dh_install
+ dh_install --sourcedir=debian/tmp --list-missing
dh_installman
dh_link
dh_strip -Xsqlitetop
@@ -111,4 +104,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install ocamlinit
More information about the Pkg-ocaml-maint-commits
mailing list