[Pkg-ocaml-maint-commits] r1427 - in trunk/packages/ocamldbi: . trunk trunk/debian trunk/debian/patches upstream
Stefano Zacchiroli
zack@costa.debian.org
Fri, 01 Jul 2005 16:01:04 +0000
Author: zack
Date: 2005-07-01 16:01:03 +0000 (Fri, 01 Jul 2005)
New Revision: 1427
Added:
trunk/packages/ocamldbi/trunk/debian/patches/
trunk/packages/ocamldbi/trunk/debian/patches/00list
trunk/packages/ocamldbi/trunk/debian/patches/15_meta.dpatch
trunk/packages/ocamldbi/trunk/debian/patches/17_old_postgres.dpatch
trunk/packages/ocamldbi/trunk/debian/patches/19_perl.dpatch
trunk/packages/ocamldbi/trunk/debian/svn-deblayout
trunk/packages/ocamldbi/upstream/
trunk/packages/ocamldbi/upstream/ocamldbi_0.9.11.orig.tar.gz
Removed:
trunk/packages/ocamldbi/trunk/debian/README.Debian
trunk/packages/ocamldbi/trunk/ocamldbi_0.9.11.orig.tar.gz
Modified:
trunk/packages/ocamldbi/trunk/debian/
trunk/packages/ocamldbi/trunk/debian/changelog
trunk/packages/ocamldbi/trunk/debian/control
trunk/packages/ocamldbi/trunk/debian/rules
Log:
a lot of changes: see debian/changelog for reference
Property changes on: trunk/packages/ocamldbi/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Deleted: trunk/packages/ocamldbi/trunk/debian/README.Debian
===================================================================
--- trunk/packages/ocamldbi/trunk/debian/README.Debian 2005-07-01 15:59:29 UTC (rev 1426)
+++ trunk/packages/ocamldbi/trunk/debian/README.Debian 2005-07-01 16:01:03 UTC (rev 1427)
@@ -1,32 +0,0 @@
-Debian README for OcamlDBI
---------------------------
-
-To compile OcamlDBI-using files to bytecode:
-
-ocamlfind ocamlc -package dbi dbi.cma -package pcre pcre.cma \
- -package postgres postgres.cma dbi_postgres.cmo \
- -package mysql mysql.cma dbi_mysql.cmo \
- -package perl perl4caml.cma dbi_perl.cmo \
- /usr/lib/perl/5.8/auto/DynaLoader/DynaLoader.a
- *.ml
-
-To compile OcamlDBI-using files to native code:
-
-ocamlfind ocamlopt -package dbi dbi.cmx -package pcre pcre.cmxa \
- -package postgres postgres.cmxa dbi_postgres.cmx \
- -package mysql mysql.cmxa dbi_mysql.cmx \
- -package perl perl4caml.cmxa dbi_perl.cmx \
- /usr/lib/perl/5.8/auto/DynaLoader/DynaLoader.a \
- *.ml
-
-Note: you'll need to make sure that, even if you use the Factory method for
-database, that the particular driver you need is linked into your final
-executable. For instance:
-
-module DB = Dbi_postgres;;
-
-...
- Dbi.Factory.connect "postgres" ~host:"foo" .....
-
-
--- John Goerzen
Modified: trunk/packages/ocamldbi/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamldbi/trunk/debian/changelog 2005-07-01 15:59:29 UTC (rev 1426)
+++ trunk/packages/ocamldbi/trunk/debian/changelog 2005-07-01 16:01:03 UTC (rev 1427)
@@ -1,3 +1,26 @@
+ocamldbi (0.9.11-2) unstable; urgency=low
+
+ * debian/{control,rules}
+ - removed dependency on libpgsql-ocaml{,-dev} (old version of OCaml
+ bindings, now implemented by the libpostgresql-ocaml{,-dev}
+ packages)
+ - removed dependency on libperl.*{,-dev} (no longer build since
+ ages)
+ - make use of dpatch
+ * debian/README.Debian
+ - removed: it contained non-debian specific and incorrect
+ information on how to compile using ocamldbi
+ * debian/patches/15_meta.dpatch
+ - add a missing dep on "num" package in META
+ * debian/patches/17_old_postgres.dpatch
+ - remove old postgres binding sub-package from META
+ * debian/patches/19_perl.dpatch
+ - remove perl sub-package from META
+ * debian/svn-deblayout,...
+ - package is now svn-buildpackage compatible
+
+ -- Stefano Zacchiroli <zack@debian.org> Thu, 30 Jun 2005 18:16:54 +0200
+
ocamldbi (0.9.11-1) unstable; urgency=medium
* New upstream release 0.9.11.
Modified: trunk/packages/ocamldbi/trunk/debian/control
===================================================================
--- trunk/packages/ocamldbi/trunk/debian/control 2005-07-01 15:59:29 UTC (rev 1426)
+++ trunk/packages/ocamldbi/trunk/debian/control 2005-07-01 16:01:03 UTC (rev 1427)
@@ -2,13 +2,13 @@
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
Uploaders: Sven Luther <luther@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, libpgsql-ocaml-dev (>= 20040120-2), ocaml-findlib, ocaml-nox-3.08.3, libmysql-ocaml-dev (>= 1.0.3-1),libocamlodbc-ocaml-dev (>= 2.7-1), libsqlite-ocaml-dev (>= 0.3.5.arch.4-3), libpostgresql-ocaml-dev (>= 1.3.3-2)
+Build-Depends: debhelper (>= 4.0.0), libpcre-ocaml-dev, ocaml-findlib, ocaml-nox-3.08.3, libmysql-ocaml-dev (>= 1.0.3-1),libocamlodbc-ocaml-dev (>= 2.7-1), libsqlite-ocaml-dev (>= 0.3.5.arch.4-3), libpostgresql-ocaml-dev (>= 1.3.3-2), dpatch
Standards-Version: 3.6.0
Package: libdbi-ocaml-dev
Section: devel
Architecture: any
-Depends: libdbi-ocaml (= ${Source-Version}), libpcre-ocaml-dev, ocaml-findlib, ocaml-nox-3.08.3, libperl4caml-ocaml-dev (>= 0.3.7-1), libpgsql-ocaml-dev (>= 20040120-3), libmysql-ocaml-dev (>= 1.0.3-1), libocamlodbc-ocaml-dev (>= 2.7-1), libsqlite-ocaml-dev (>= 0.3.5.arch.4-3), libpostgresql-ocaml-dev (>= 1.3.3-2), ${shlibs:Depends}, ${misc:Depends}
+Depends: libdbi-ocaml (= ${Source-Version}), libpcre-ocaml-dev, ocaml-findlib, ocaml-nox-3.08.3, libmysql-ocaml-dev (>= 1.0.3-1), libocamlodbc-ocaml-dev (>= 2.7-1), libsqlite-ocaml-dev (>= 0.3.5.arch.4-3), libpostgresql-ocaml-dev (>= 1.3.3-2), ${shlibs:Depends}, ${misc:Depends}
Description: Database Independent Interface (DBI) for Objective CAML, development files
Database Independent Interface (DBI) for Objective CAML provides a
consistent and simple interface for accessing databases.
@@ -19,7 +19,7 @@
Section: libs
Architecture: any
Depends: libpcre-ocaml, ocaml-base-nox-3.08.3
-Suggests: libperl4caml-ocaml, libpgsql-ocaml-dev, libmysql-ocaml-dev, libsqlite-ocaml-dev, libpostgresql-ocaml-dev
+Suggests: libmysql-ocaml-dev, libsqlite-ocaml-dev, libpostgresql-ocaml-dev
Description: Database Independent Interface (DBI) for Objective CAML, bytecode runtime files
Database Independent Interface (DBI) for Objective CAML provides a
consistent and simple interface for accessing databases.
Added: trunk/packages/ocamldbi/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ocamldbi/trunk/debian/patches/00list 2005-07-01 15:59:29 UTC (rev 1426)
+++ trunk/packages/ocamldbi/trunk/debian/patches/00list 2005-07-01 16:01:03 UTC (rev 1427)
@@ -0,0 +1,3 @@
+15_meta
+17_old_postgres
+19_perl
Added: trunk/packages/ocamldbi/trunk/debian/patches/15_meta.dpatch
===================================================================
--- trunk/packages/ocamldbi/trunk/debian/patches/15_meta.dpatch 2005-07-01 15:59:29 UTC (rev 1426)
+++ trunk/packages/ocamldbi/trunk/debian/patches/15_meta.dpatch 2005-07-01 16:01:03 UTC (rev 1427)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_meta.dpatch by <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./META.in /tmp/dpep-work.f3jypQ/trunk/META.in
+--- ./META.in 2005-07-01 16:37:35.004673152 +0200
++++ /tmp/dpep-work.f3jypQ/trunk/META.in 2005-07-01 16:37:49.137524632 +0200
+@@ -1,6 +1,7 @@
+ name="@PACKAGE@"
+ version="@VERSION@"
+ description="OCaml Database Independent Library"
++requires = "num"
+ archive(byte) = "dbi.cma"
+ archive(native) = "dbi.cmxa"
+
Property changes on: trunk/packages/ocamldbi/trunk/debian/patches/15_meta.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/ocamldbi/trunk/debian/patches/17_old_postgres.dpatch
===================================================================
--- trunk/packages/ocamldbi/trunk/debian/patches/17_old_postgres.dpatch 2005-07-01 15:59:29 UTC (rev 1426)
+++ trunk/packages/ocamldbi/trunk/debian/patches/17_old_postgres.dpatch 2005-07-01 16:01:03 UTC (rev 1427)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17_old_postgres.dpatch by <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: remove subpackage for old postgres bindings from META
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./META.in /tmp/dpep-work.7obpWd/trunk/META.in
+--- ./META.in 2004-10-16 13:07:58.000000000 +0200
++++ /tmp/dpep-work.7obpWd/trunk/META.in 2005-06-30 18:27:39.879658232 +0200
+@@ -16,12 +16,6 @@
+ archive(native) = "dbi_perl.cmx"
+ )
+
+-package "postgres" (
+- requires = "dbi,postgres,pcre"
+- archive(byte) = "dbi_postgres.cmo"
+- archive(native) = "dbi_postgres.cmx"
+-)
+-
+ package "postgresql" (
+ requires = "dbi,postgresql,pcre"
+ archive(byte) = "dbi_postgresql.cmo"
Property changes on: trunk/packages/ocamldbi/trunk/debian/patches/17_old_postgres.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/ocamldbi/trunk/debian/patches/19_perl.dpatch
===================================================================
--- trunk/packages/ocamldbi/trunk/debian/patches/19_perl.dpatch 2005-07-01 15:59:29 UTC (rev 1426)
+++ trunk/packages/ocamldbi/trunk/debian/patches/19_perl.dpatch 2005-07-01 16:01:03 UTC (rev 1427)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19_perl.dpatch by <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad --exclude=CVS --exclude=.svn ./META.in /tmp/dpep-work.du3ch4/trunk/META.in
+--- ./META.in 2005-07-01 16:39:08.327485928 +0200
++++ /tmp/dpep-work.du3ch4/trunk/META.in 2005-07-01 16:39:17.266127048 +0200
+@@ -10,12 +10,6 @@
+ archive(native) = "dbi_mysql.cmx"
+ )
+
+-package "perl" (
+- requires = "dbi,perl"
+- archive(byte) = "dbi_perl.cmo"
+- archive(native) = "dbi_perl.cmx"
+-)
+-
+ package "postgresql" (
+ requires = "dbi,postgresql,pcre"
+ archive(byte) = "dbi_postgresql.cmo"
Property changes on: trunk/packages/ocamldbi/trunk/debian/patches/19_perl.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/ocamldbi/trunk/debian/rules
===================================================================
--- trunk/packages/ocamldbi/trunk/debian/rules 2005-07-01 15:59:29 UTC (rev 1426)
+++ trunk/packages/ocamldbi/trunk/debian/rules 2005-07-01 16:01:03 UTC (rev 1427)
@@ -1,20 +1,18 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
+include /usr/share/dpatch/dpatch.make
+
#export DH_VERBOSE=1
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
dh_testdir
touch configure-stamp
build: build-stamp
MAKEARGS := BUILD_OPT=`test \! -x /usr/bin/ocamlopt; echo $$?` \
HAVE_MYSQL=1 HAVE_CAMLTEMPLATE=0 HAVE_PERL4CAML=0 \
- HAVE_POSTGRES=1 HAVE_POSTGRESQL=1 HAVE_OCAMLODBC=0 \
+ HAVE_POSTGRES=0 HAVE_POSTGRESQL=1 HAVE_OCAMLODBC=0 \
HAVE_SQLITE=1
build-stamp: configure-stamp
dh_testdir
@@ -27,7 +25,8 @@
touch build-stamp
-clean:
+clean: patch clean1 unpatch
+clean1:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
Added: trunk/packages/ocamldbi/trunk/debian/svn-deblayout
===================================================================
--- trunk/packages/ocamldbi/trunk/debian/svn-deblayout 2005-07-01 15:59:29 UTC (rev 1426)
+++ trunk/packages/ocamldbi/trunk/debian/svn-deblayout 2005-07-01 16:01:03 UTC (rev 1427)
@@ -0,0 +1,3 @@
+origDir=../upstream
+origUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamldbi/upstream
+tagsUrl=svn+ssh://svn.debian.org/svn/pkg-ocaml-maint/tags/packages/ocamldbi
Deleted: trunk/packages/ocamldbi/trunk/ocamldbi_0.9.11.orig.tar.gz
===================================================================
(Binary files differ)
Copied: trunk/packages/ocamldbi/upstream/ocamldbi_0.9.11.orig.tar.gz (from rev 1410, trunk/packages/ocamldbi/trunk/ocamldbi_0.9.11.orig.tar.gz)