[Pkg-ocaml-maint-commits] r2057 - in trunk/packages/ocaml-sqlite/trunk: . debian

[Samuel Mimram]

Author: smimram-guest
Date: 2005-11-15 22:32:16 +0000 (Tue, 15 Nov 2005)
New Revision: 2057

Added:
   trunk/packages/ocaml-sqlite/trunk/debian/control.in
   trunk/packages/ocaml-sqlite/trunk/debian/svn-deblayout
   trunk/packages/ocaml-sqlite/trunk/debian/watch
Removed:
   trunk/packages/ocaml-sqlite/trunk/ocaml-sqlite_0.3.5.arch.4.orig.tar.gz
Modified:
   trunk/packages/ocaml-sqlite/trunk/debian/
   trunk/packages/ocaml-sqlite/trunk/debian/changelog
   trunk/packages/ocaml-sqlite/trunk/debian/control
   trunk/packages/ocaml-sqlite/trunk/debian/rules
Log:
Updated to OCaml 3.09.0.


Property changes on: trunk/packages/ocaml-sqlite/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/packages/ocaml-sqlite/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/changelog	2005-11-15 22:13:11 UTC (rev 2056)
+++ trunk/packages/ocaml-sqlite/trunk/debian/changelog	2005-11-15 22:32:16 UTC (rev 2057)
@@ -1,3 +1,11 @@
+ocaml-sqlite (0.3.5.arch.4-5) unstable; urgency=low
+
+  * Rebuild with OCaml 3.09.0.
+  * No longer hardcoding OCaml's ABI in debian/* files.
+  * Updated standards version to 3.6.2, no changes needed.
+
+ -- Samuel Mimram <smimram at debian.org>  Tue, 15 Nov 2005 23:19:39 +0100
+
 ocaml-sqlite (0.3.5.arch.4-4) unstable; urgency=medium
 
   * New Maintainer: Debian OCaml Maintainers, added myself to uploaders.

Modified: trunk/packages/ocaml-sqlite/trunk/debian/control
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/control	2005-11-15 22:13:11 UTC (rev 2056)
+++ trunk/packages/ocaml-sqlite/trunk/debian/control	2005-11-15 22:32:16 UTC (rev 2057)
@@ -3,12 +3,12 @@
 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.08.3, ocaml-findlib (>= 1.0.4-1), dpatch
-Standards-Version: 3.6.1.1
+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
+Standards-Version: 3.6.2
 
 Package: libsqlite-ocaml-dev
 Architecture: any
-Depends: libsqlite-ocaml (= ${Source-Version})
+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
@@ -21,7 +21,7 @@
 Package: libsqlite-ocaml
 Section: libs
 Architecture: any
-Depends: ocaml-3.08.3, ${shlibs:Depends}
+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

Copied: trunk/packages/ocaml-sqlite/trunk/debian/control.in (from rev 2056, trunk/packages/ocaml-sqlite/trunk/debian/control)
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/control	2005-11-15 22:13:11 UTC (rev 2056)
+++ trunk/packages/ocaml-sqlite/trunk/debian/control.in	2005-11-15 22:32:16 UTC (rev 2057)
@@ -0,0 +1,32 @@
+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.

Modified: trunk/packages/ocaml-sqlite/trunk/debian/rules
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/rules	2005-11-15 22:13:11 UTC (rev 2056)
+++ trunk/packages/ocaml-sqlite/trunk/debian/rules	2005-11-15 22:32:16 UTC (rev 2057)
@@ -9,6 +9,9 @@
 # We want to use dpatch
 include /usr/share/dpatch/dpatch.make
 
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+
 # 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)
@@ -26,6 +29,9 @@
 	INSTALL_PROGRAM += -s
 endif
 
+ocamlinit:
+	for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+
 config.status: configure.ac
 	dh_testdir
 	autoconf
@@ -43,7 +49,7 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
 
 	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -57,13 +63,13 @@
 	-rm -rf doc
 	-rm debian/libsqlite-ocaml.files
 
-	dh_clean 
+	dh_clean
 
 DESTDIR=$(CURDIR)/debian/libsqlite-ocaml-dev
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
+	dh_clean -k
 	dh_installdirs
 	echo `ocamlc -where` | sed -e 's.^/..' -e 's.$$./*.' > debian/libsqlite-ocaml.files
 
@@ -100,9 +106,9 @@
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
 	dh_md5sums
 	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

Added: trunk/packages/ocaml-sqlite/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/svn-deblayout	2005-11-15 22:13:11 UTC (rev 2056)
+++ trunk/packages/ocaml-sqlite/trunk/debian/svn-deblayout	2005-11-15 22:32:16 UTC (rev 2057)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocaml-sqlite/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocaml-sqlite

Added: trunk/packages/ocaml-sqlite/trunk/debian/watch
===================================================================
--- trunk/packages/ocaml-sqlite/trunk/debian/watch	2005-11-15 22:13:11 UTC (rev 2056)
+++ trunk/packages/ocaml-sqlite/trunk/debian/watch	2005-11-15 22:32:16 UTC (rev 2057)
@@ -0,0 +1,3 @@
+version=3
+
+http://neugierig.org/software/ocaml/sqlite/ocaml-sqlite-([0-9\.]*).tar.bz2 debian uupdate

Deleted: trunk/packages/ocaml-sqlite/trunk/ocaml-sqlite_0.3.5.arch.4.orig.tar.gz
===================================================================
(Binary files differ)