[Pkg-ocaml-maint-commits] [SCM] pgocaml packaging branch, master, updated. upstream/1.2-4-g6da88cf
Guillaume Yziquel
guillaume.yziquel at citycable.ch
Tue Jun 9 22:40:14 UTC 2009
The following commit has been merged in the master branch:
commit 6da88cf0d443443b5137aeb0db5f599c7a5f5e03
Author: Guillaume Yziquel <guillaume.yziquel at citycable.ch>
Date: Tue Jun 9 23:08:57 2009 +0200
Versioning the main branch of pgocaml, formerly known as the monadic branch.
diff --git a/debian/README.Debian b/debian/README.Debian
index 138d397..e72026a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,9 +1,6 @@
PG'OCaml for Debian
------------------------
-This is the classic branch of PG'OCaml. It may not be supported in the future. Please
-consider switching to the main branch of PG'OCaml, formerly known as the known as the
-monadic branch.
OBTAINING UPSTREAM SOURCE:
diff --git a/debian/changelog b/debian/changelog
index f085d26..8a24283 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-pgocaml-classic (1.2-1) UNRELEASED; urgency=low
+pgocaml (1.3-1) UNRELEASED; urgency=low
* Initial release (Closes: #516629)
- -- Guillaume Yziquel <guillaume.yziquel at citycable.ch> Thu, 02 Jun 2009 17:10:26 +0100
+ -- Guillaume Yziquel <guillaume.yziquel at citycable.ch> Thu, 07 Jun 2009 00:26:42 +0100
diff --git a/debian/control b/debian/control
index 2f06fa2..ea82de4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: pgocaml-classic
+Source: pgocaml
Section: ocaml
Priority: optional
Maintainer: "Debian OCaml Maintainers" <debian-ocaml-maint at lists.debian.org>
@@ -11,7 +11,7 @@ Build-Depends: cdbs (>= 0.4.52), debhelper (>= 7), dpatch, dh-ocaml,
Standards-Version: 3.8.0
Homepage: http://developer.berlios.de/projects/pgocaml/
-Package: libpgocaml-classic-ocaml-dev
+Package: libpgocaml-ocaml-dev
Architecture: any
Depends: ocaml-base-nox-${F:OCamlABI},
libextlib-ocaml-dev, libpcre-ocaml-dev,
@@ -26,5 +26,3 @@ Description: OCaml type-safe bindings for PostgreSQL
to check at compile-time if the program is indeed consistent with the database
structure. This type-safe database access is the primary advantage that PG'OCaml
has over other PostgreSQL bindings for Ocaml.
- The classic branch of PG'OCaml, developed by Richard W.M. Jones. This branch may
- be discontinued in future releases.
diff --git a/debian/libpgocaml-classic-ocaml-dev.dirs.in b/debian/libpgocaml-ocaml-dev.dirs.in
similarity index 100%
rename from debian/libpgocaml-classic-ocaml-dev.dirs.in
rename to debian/libpgocaml-ocaml-dev.dirs.in
diff --git a/debian/patches/00list b/debian/patches/00list
index 40eedeb..4de5aa4 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,3 @@
-01_namespaces
+01_makefile_depend
02_postgresql_socket
-03_makefile_depend
-04_makefile_mli
+03_makefile_mli
diff --git a/debian/patches/01_makefile_depend.dpatch b/debian/patches/01_makefile_depend.dpatch
new file mode 100644
index 0000000..3881e7e
--- /dev/null
+++ b/debian/patches/01_makefile_depend.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_makefile_depend.dpatch by <yziquel at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Including the make depend dependencies in the Makefile.
+
+ at DPATCH@
+diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
+--- pgocaml-1.3~/Makefile 2009-04-30 19:13:57.000000000 +0200
++++ pgocaml-1.3/Makefile 2009-06-07 00:33:43.000000000 +0200
+@@ -141,9 +141,14 @@
+ ocamldep pGOCaml*.ml pGOCaml*.mli > $@
+ -ocamldep -pp "camlp4o $(FOR_P4) ./pa_pgsql.cmo" >> $@
+
+-ifeq ($(wildcard .depend),.depend)
+-include .depend
+-endif
++pGOCaml_config.cmo:
++pGOCaml_config.cmx:
++pGOCaml_generic.cmo: pGOCaml_config.cmo pGOCaml_generic.cmi
++pGOCaml_generic.cmx: pGOCaml_config.cmx pGOCaml_generic.cmi
++pGOCaml.cmo: pGOCaml_generic.cmi pGOCaml.cmi
++pGOCaml.cmx: pGOCaml_generic.cmx pGOCaml.cmi
++pGOCaml_generic.cmi:
++pGOCaml.cmi: pGOCaml_generic.cmi
+
+ #
+ # Install.
diff --git a/debian/patches/01_namespaces.dpatch b/debian/patches/01_namespaces.dpatch
deleted file mode 100755
index ab53b56..0000000
--- a/debian/patches/01_namespaces.dpatch
+++ /dev/null
@@ -1,145 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_namespaces.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adjusting namespaces to the debian setup of CalendarLib.
-
- at DPATCH@
-diff -urNad pgocaml-classic-1.2~/pGOCaml.ml pgocaml-classic-1.2/pGOCaml.ml
---- pgocaml-classic-1.2~/pGOCaml.ml 2009-02-13 10:31:39.000000000 +0100
-+++ pgocaml-classic-1.2/pGOCaml.ml 2009-02-13 10:32:50.000000000 +0100
-@@ -1068,7 +1068,7 @@
- (* For unknown types, look at <postgresql/catalog/pg_type.h>. *)
- raise (Error ("PGOCaml: unknown type for OID " ^ Int32.to_string i))
-
--type timestamptz = Calendar.t * Time_Zone.t
-+type timestamptz = CalendarLib.Calendar.t * CalendarLib.Time_Zone.t
-
- type int16 = int
- type bytea = string
-@@ -1084,22 +1084,22 @@
- let string_of_int32 = Int32.to_string
- let string_of_int64 = Int64.to_string
- let string_of_float = string_of_float
--let string_of_timestamp = Printer.CalendarPrinter.to_string
-+let string_of_timestamp = CalendarLib.Printer.CalendarPrinter.to_string
- let string_of_timestamptz (cal, tz) =
-- Printer.CalendarPrinter.to_string cal ^
-+ CalendarLib.Printer.CalendarPrinter.to_string cal ^
- match tz with
-- | Time_Zone.UTC -> "+00"
-- | Time_Zone.Local ->
-- let gap = Time_Zone.gap Time_Zone.UTC Time_Zone.Local in
-+ | CalendarLib.Time_Zone.UTC -> "+00"
-+ | CalendarLib.Time_Zone.Local ->
-+ let gap = CalendarLib.Time_Zone.gap CalendarLib.Time_Zone.UTC CalendarLib.Time_Zone.Local in
- if gap >= 0 then sprintf "+%02d" gap
- else sprintf "-%02d" (-gap)
-- | Time_Zone.UTC_Plus gap ->
-+ | CalendarLib.Time_Zone.UTC_Plus gap ->
- if gap >= 0 then sprintf "+%02d" gap
- else sprintf "-%02d" (-gap)
--let string_of_date = Printer.DatePrinter.to_string
--let string_of_time = Printer.TimePrinter.to_string
-+let string_of_date = CalendarLib.Printer.DatePrinter.to_string
-+let string_of_time = CalendarLib.Printer.TimePrinter.to_string
- let string_of_interval p =
-- let y, m, d, s = Calendar.Period.ymds p in
-+ let y, m, d, s = CalendarLib.Calendar.Period.ymds p in
- sprintf "%d years %d mons %d days %d seconds" y m d s
-
- let string_of_unit () = ""
-@@ -1148,7 +1148,7 @@
- let int32_of_string = Int32.of_string
- let int64_of_string = Int64.of_string
- let float_of_string = float_of_string
--let date_of_string = Printer.DatePrinter.from_string
-+let date_of_string = CalendarLib.Printer.DatePrinter.from_string
-
- let time_of_string str =
- (* Remove trailing ".microsecs" if present. *)
-@@ -1157,7 +1157,7 @@
- if n > 8 && str.[8] = '.' then
- String.sub str 0 8
- else str in
-- Printer.TimePrinter.from_string str
-+ CalendarLib.Printer.TimePrinter.from_string str
-
- let timestamp_of_string str =
- (* Remove trailing ".microsecs" if present. *)
-@@ -1166,7 +1166,7 @@
- if n > 19 && str.[19] = '.' then
- String.sub str 0 19
- else str in
-- Printer.CalendarPrinter.from_string str
-+ CalendarLib.Printer.CalendarPrinter.from_string str
-
- let timestamptz_of_string str =
- (* Split into datetime+timestamp. *)
-@@ -1178,11 +1178,11 @@
- str, None in
- let cal = timestamp_of_string cal in
- let tz = match tz with
-- | None -> Time_Zone.Local (* best guess? *)
-+ | None -> CalendarLib.Time_Zone.Local (* best guess? *)
- | Some tz ->
- let sgn = match tz.[0] with '+' -> 1 | '-' -> 0 | _ -> assert false in
- let mag = int_of_string (String.sub tz 1 2) in
-- Time_Zone.UTC_Plus (sgn * mag) in
-+ CalendarLib.Time_Zone.UTC_Plus (sgn * mag) in
- cal, tz
-
- let re_interval =
-@@ -1202,7 +1202,7 @@
- fun str ->
- try
- let sub = Pcre.extract ~rex:re_interval str in
-- Calendar.Period.make
-+ CalendarLib.Calendar.Period.make
- (int_opt sub.(1)) (* year *)
- (int_opt sub.(2)) (* month *)
- (int_opt sub.(3)) (* day *)
-diff -urNad pgocaml-classic-1.2~/pGOCaml.mli pgocaml-classic-1.2/pGOCaml.mli
---- pgocaml-classic-1.2~/pGOCaml.mli 2009-02-13 10:31:39.000000000 +0100
-+++ pgocaml-classic-1.2/pGOCaml.mli 2009-02-13 10:33:44.000000000 +0100
-@@ -195,7 +195,7 @@
- * example, [name_of_type (Int32.of_int 25)] returns ["string"].
- *)
-
--type timestamptz = Calendar.t * Time_Zone.t
-+type timestamptz = CalendarLib.Calendar.t * CalendarLib.Time_Zone.t
-
- type int16 = int
- type bytea = string (* XXX *)
-@@ -209,11 +209,11 @@
- val string_of_int32 : int32 -> string
- val string_of_int64 : int64 -> string
- val string_of_float : float -> string
--val string_of_timestamp : Calendar.t -> string
-+val string_of_timestamp : CalendarLib.Calendar.t -> string
- val string_of_timestamptz : timestamptz -> string
--val string_of_date : Date.t -> string
--val string_of_time : Time.t -> string
--val string_of_interval : Calendar.Period.t -> string
-+val string_of_date : CalendarLib.Date.t -> string
-+val string_of_time : CalendarLib.Time.t -> string
-+val string_of_interval : CalendarLib.Calendar.Period.t -> string
- val string_of_int32_array : int32_array -> string
- val string_of_bytea : bytea -> string
- val string_of_string : string -> string
-@@ -225,11 +225,11 @@
- val int32_of_string : string -> int32
- val int64_of_string : string -> int64
- val float_of_string : string -> float
--val timestamp_of_string : string -> Calendar.t
-+val timestamp_of_string : string -> CalendarLib.Calendar.t
- val timestamptz_of_string : string -> timestamptz
--val date_of_string : string -> Date.t
--val time_of_string : string -> Time.t
--val interval_of_string : string -> Calendar.Period.t
-+val date_of_string : string -> CalendarLib.Date.t
-+val time_of_string : string -> CalendarLib.Time.t
-+val interval_of_string : string -> CalendarLib.Calendar.Period.t
- val int32_array_of_string : string -> int32_array
- val bytea_of_string : string -> bytea
- val unit_of_string : string -> unit
diff --git a/debian/patches/02_postgresql_socket.dpatch b/debian/patches/02_postgresql_socket.dpatch
old mode 100755
new mode 100644
index 899a722..30244af
--- a/debian/patches/02_postgresql_socket.dpatch
+++ b/debian/patches/02_postgresql_socket.dpatch
@@ -1,14 +1,14 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_postgresql_socket.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
+## 02_postgresql_socket.dpatch by <yziquel at localhost>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Setting the Postgesql socket's directory according to default Debian setup.
+## DP: Adapting the postgresql socket for Debian systems.
@DPATCH@
-diff -urNad pgocaml-classic-1.2~/Makefile.config pgocaml-classic-1.2/Makefile.config
---- pgocaml-classic-1.2~/Makefile.config 2009-05-28 14:31:08.000000000 +0200
-+++ pgocaml-classic-1.2/Makefile.config 2009-06-02 19:26:59.000000000 +0200
-@@ -24,8 +24,8 @@
+diff -urNad pgocaml-1.3~/Makefile.config pgocaml-1.3/Makefile.config
+--- pgocaml-1.3~/Makefile.config 2009-06-01 13:07:28.000000000 +0200
++++ pgocaml-1.3/Makefile.config 2009-06-09 15:47:17.000000000 +0200
+@@ -9,8 +9,8 @@
# Default location for Unix domain socket directory. If the auto-detection
# does not work on your system, please set this variable manually.
diff --git a/debian/patches/03_makefile_depend.dpatch b/debian/patches/03_makefile_depend.dpatch
deleted file mode 100755
index dff2d82..0000000
--- a/debian/patches/03_makefile_depend.dpatch
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_makefile_depend.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Circumventing the Makefile's depend target.
-
- at DPATCH@
-diff -urNad pgocaml-classic-1.2~/Makefile pgocaml-classic-1.2/Makefile
---- pgocaml-classic-1.2~/Makefile 2009-04-30 19:13:57.000000000 +0200
-+++ pgocaml-classic-1.2/Makefile 2009-06-04 22:25:42.000000000 +0200
-@@ -134,16 +134,20 @@
- # Dependencies.
- #
-
--depend: .depend
--
--.depend: pGOCaml_config.ml
-- rm -f .depend
-- ocamldep pGOCaml.mli pGOCaml.ml test_pgocaml_lowlevel.ml > $@
-- -ocamldep -pp "camlp4o $(FOR_P4) ./pa_pgsql.cmo" test_pgocaml.ml >> $@
-+#depend: .depend
-+#
-+#.depend: pGOCaml_config.ml
-+# rm -f .depend
-+# ocamldep pGOCaml.mli pGOCaml.ml test_pgocaml_lowlevel.ml > $@
-+# -ocamldep -pp "camlp4o $(FOR_P4) ./pa_pgsql.cmo" test_pgocaml.ml >> $@
-+#
-+#ifeq ($(wildcard .depend),.depend)
-+#include .depend
-+#endif
-
--ifeq ($(wildcard .depend),.depend)
--include .depend
--endif
-+pGOCaml.cmi:
-+pGOCaml.cmo: pGOCaml_config.cmo pGOCaml.cmi
-+pGOCaml.cmx: pGOCaml_config.cmx pGOCaml.cmi
-
- #
- # Install.
diff --git a/debian/patches/03_makefile_mli.dpatch b/debian/patches/03_makefile_mli.dpatch
new file mode 100644
index 0000000..f99ef8f
--- /dev/null
+++ b/debian/patches/03_makefile_mli.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_makefile_mli.dpatch by <yziquel at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Including .mli files for documentation generation.
+
+ at DPATCH@
+diff -urNad pgocaml-1.3~/Makefile pgocaml-1.3/Makefile
+--- pgocaml-1.3~/Makefile 2009-06-09 15:31:01.000000000 +0200
++++ pgocaml-1.3/Makefile 2009-06-09 15:31:49.000000000 +0200
+@@ -155,7 +155,7 @@
+ #
+
+ findlib_install:
+- ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa pGOCaml_generic.cm[ix] pGOCaml.cm[ix] pa_pgsql.cmo
++ ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa pGOCaml_generic.cm[ix] pGOCaml.cm[ix] pa_pgsql.cmo pGOCaml_generic.mli pGOCaml.mli
+
+ reinstall:
+ ocamlfind remove $(PACKAGE)
diff --git a/debian/patches/04_makefile_mli.dpatch b/debian/patches/04_makefile_mli.dpatch
deleted file mode 100755
index bdbab33..0000000
--- a/debian/patches/04_makefile_mli.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_makefile_mli.dpatch by Guillaume Yziquel <guillaume.yziquel at citycable.ch>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: .mli file installed for ocamldoc documentation generation.
-
- at DPATCH@
-diff -urNad pgocaml-classic-1.2~/Makefile pgocaml-classic-1.2/Makefile
---- pgocaml-classic-1.2~/Makefile 2009-06-04 23:23:33.000000000 +0200
-+++ pgocaml-classic-1.2/Makefile 2009-06-04 23:24:09.000000000 +0200
-@@ -154,7 +154,7 @@
- #
-
- findlib_install:
-- ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa pGOCaml.cm[ix] pa_pgsql.cmo
-+ ocamlfind install $(PACKAGE) META pgocaml.a pgocaml.cma pgocaml.cmxa pGOCaml.cm[ix] pa_pgsql.cmo pGOCaml.mli
-
- reinstall:
- ocamlfind remove $(PACKAGE)
diff --git a/debian/rules b/debian/rules
index 3e5d99f..9ff6fea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
#!/usr/bin/make -f
-# debian/rules for pgocaml-classic package
+# debian/rules for pgocaml package
# Copyright (C) 2009 Guillaume Yziquel <guillaume.yziquel at citycable.ch>
#
# This program is free software; you can redistribute it and/or
@@ -22,7 +22,7 @@ include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/class/ocaml.mk
-DESTDIR_DEV=$(CURDIR)/debian/libpgocaml-classic-ocaml-dev
+DESTDIR_DEV=$(CURDIR)/debian/libpgocaml-ocaml-dev
DEB_MAKE_CLEAN_TARGET := clean
ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
@@ -34,6 +34,6 @@ DEB_MAKE_INSTALL_TARGET := findlib_install
endif
DEB_MAKE_INSTALL_TARGET += OCAMLFIND_DESTDIR="$(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)"
-OCAML_OCAMLDOC_PACKAGES = libpgocaml-classic-ocaml-dev
+OCAML_OCAMLDOC_PACKAGES = libpgocaml-ocaml-dev
OCAML_OCAMLDOC_OCAMLFIND_FLAGS = -package extlib -package pcre -package csv -package calendar
#OCAML_OCAMLDOC_FLAGS += -I +camlp4
diff --git a/debian/watch b/debian/watch
index af4eb4d..6815ec4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-http://download.berlios.de/pgocaml/pgocaml-classic([\d\.]*)\.tgz
+http://download.berlios.de/pgocaml/pgocaml-([\d\.]*)\.tgz
--
pgocaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list