[Pkg-ocaml-maint-commits] r2080 - trunk/packages/equeue/trunk/debian
Samuel Mimram
smimram-guest at costa.debian.org
Sun Nov 20 15:52:53 UTC 2005
Author: smimram-guest
Date: 2005-11-20 15:52:52 +0000 (Sun, 20 Nov 2005)
New Revision: 2080
Added:
trunk/packages/equeue/trunk/debian/control.in
trunk/packages/equeue/trunk/debian/dirs.in
trunk/packages/equeue/trunk/debian/libequeue-gtk2-ocaml-dev.install.in
trunk/packages/equeue/trunk/debian/libequeue-ocaml-dev.install.in
trunk/packages/equeue/trunk/debian/libequeue-ocaml.install.in
Modified:
trunk/packages/equeue/trunk/debian/changelog
trunk/packages/equeue/trunk/debian/control
trunk/packages/equeue/trunk/debian/dirs
trunk/packages/equeue/trunk/debian/libequeue-gtk2-ocaml-dev.install
trunk/packages/equeue/trunk/debian/libequeue-ocaml-dev.install
trunk/packages/equeue/trunk/debian/libequeue-ocaml.install
trunk/packages/equeue/trunk/debian/rules
Log:
Rebuild with OCaml 3.09.0.
Modified: trunk/packages/equeue/trunk/debian/changelog
===================================================================
--- trunk/packages/equeue/trunk/debian/changelog 2005-11-20 15:40:21 UTC (rev 2079)
+++ trunk/packages/equeue/trunk/debian/changelog 2005-11-20 15:52:52 UTC (rev 2080)
@@ -1,3 +1,10 @@
+equeue (2.1.3-3) unstable; urgency=low
+
+ * Rebuild with OCaml 3.09.0.
+ * No longer hardcoding OCaml's ABI.
+
+ -- Samuel Mimram <smimram at debian.org> Sun, 20 Nov 2005 16:42:00 +0100
+
equeue (2.1.3-2) unstable; urgency=low
* Added the libequeue-gtk2-ocaml-dev package for the version of equeue
Modified: trunk/packages/equeue/trunk/debian/control
===================================================================
--- trunk/packages/equeue/trunk/debian/control 2005-11-20 15:40:21 UTC (rev 2079)
+++ trunk/packages/equeue/trunk/debian/control 2005-11-20 15:52:52 UTC (rev 2080)
@@ -2,13 +2,13 @@
Section: devel
Priority: optional
Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-findlib, ocaml-nox-3.08.3, liblablgtk2-ocaml-dev
+Build-Depends: debhelper (>= 4.0.0), ocaml-findlib, ocaml-nox (>= 3.09.0), liblablgtk2-ocaml-dev
Standards-Version: 3.6.2
Package: libequeue-ocaml
Section: libs
Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
Provides: libshell-ocaml
Conflicts: libshell-ocaml
Replaces: libshell-ocaml
@@ -36,7 +36,7 @@
Package: libequeue-ocaml-dev
Section: libdevel
Architecture: any
-Depends: ocaml-nox-3.08.3, libequeue-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libequeue-ocaml (= ${Source-Version})
Provides: libshell-ocaml-dev
Conflicts: libshell-ocaml-dev
Replaces: libshell-ocaml-dev
@@ -66,7 +66,7 @@
Package: libequeue-gtk2-ocaml-dev
Section: libdevel
Architecture: any
-Depends: ocaml-nox-3.08.3, libequeue-ocaml-dev (= ${Source-Version}), liblablgtk2-ocaml-dev
+Depends: ocaml-nox-${F:OCamlABI}, libequeue-ocaml-dev (= ${Source-Version}), liblablgtk2-ocaml-dev
Suggests: ocaml-findlib
Description: Event queues OCaml library
Equeue is an Objective Caml (OCaml) library containing a generic
Copied: trunk/packages/equeue/trunk/debian/control.in (from rev 1787, trunk/packages/equeue/trunk/debian/control)
===================================================================
--- trunk/packages/equeue/trunk/debian/control 2005-09-21 16:53:46 UTC (rev 1787)
+++ trunk/packages/equeue/trunk/debian/control.in 2005-11-20 15:52:52 UTC (rev 2080)
@@ -0,0 +1,91 @@
+Source: equeue
+Section: devel
+Priority: optional
+Maintainer: Samuel Mimram <smimram at debian.org>
+Build-Depends: debhelper (>= 4.0.0), ocaml-findlib, ocaml-nox (>= @OCamlABI@), liblablgtk2-ocaml-dev
+Standards-Version: 3.6.2
+
+Package: libequeue-ocaml
+Section: libs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Provides: libshell-ocaml
+Conflicts: libshell-ocaml
+Replaces: libshell-ocaml
+Description: Event queues OCaml library
+ Equeue is an Objective Caml (OCaml) library containing a generic
+ implementation of queues of events of any type, and a specific
+ implementation of queues of file descriptor events.
+ .
+ The generic module allows to associate an event queue with an event
+ source, and one or several event handlers. The event source generates
+ new events that are triggered from the outer world. The handlers
+ consume events, but it is allowed that handlers also generate events.
+ .
+ The module for file descriptor events already defines an event source;
+ this source watches registered file descriptors and produces events if
+ a descriptor wants to deliver data, or if a descriptor is ready to
+ accept data. As in the generic module, the handlers consume the
+ events.
+ .
+ The main application of these modules are implementations of protocol
+ stacks which can cooperate with each other.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libequeue-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libequeue-ocaml (= ${Source-Version})
+Provides: libshell-ocaml-dev
+Conflicts: libshell-ocaml-dev
+Replaces: libshell-ocaml-dev
+Suggests: ocaml-findlib, libequeue-gtk2-ocaml-dev
+Description: Event queues OCaml library
+ Equeue is an Objective Caml (OCaml) library containing a generic
+ implementation of queues of events of any type, and a specific
+ implementation of queues of file descriptor events.
+ .
+ The generic module allows to associate an event queue with an event
+ source, and one or several event handlers. The event source generates
+ new events that are triggered from the outer world. The handlers
+ consume events, but it is allowed that handlers also generate events.
+ .
+ The module for file descriptor events already defines an event source;
+ this source watches registered file descriptors and produces events if
+ a descriptor wants to deliver data, or if a descriptor is ready to
+ accept data. As in the generic module, the handlers consume the
+ events.
+ .
+ The main application of these modules are implementations of protocol
+ stacks which can cooperate with each other.
+ .
+ This package contains all the development stuff you need to use
+ the equeue OCaml library in your programs.
+
+Package: libequeue-gtk2-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libequeue-ocaml-dev (= ${Source-Version}), liblablgtk2-ocaml-dev
+Suggests: ocaml-findlib
+Description: Event queues OCaml library
+ Equeue is an Objective Caml (OCaml) library containing a generic
+ implementation of queues of events of any type, and a specific
+ implementation of queues of file descriptor events.
+ .
+ The generic module allows to associate an event queue with an event
+ source, and one or several event handlers. The event source generates
+ new events that are triggered from the outer world. The handlers
+ consume events, but it is allowed that handlers also generate events.
+ .
+ The module for file descriptor events already defines an event source;
+ this source watches registered file descriptors and produces events if
+ a descriptor wants to deliver data, or if a descriptor is ready to
+ accept data. As in the generic module, the handlers consume the
+ events.
+ .
+ The main application of these modules are implementations of protocol
+ stacks which can cooperate with each other.
+ .
+ This package contains all the development stuff you need to use
+ the equeue OCaml library in your programs which use lablgtk2.
Modified: trunk/packages/equeue/trunk/debian/dirs
===================================================================
--- trunk/packages/equeue/trunk/debian/dirs 2005-11-20 15:40:21 UTC (rev 2079)
+++ trunk/packages/equeue/trunk/debian/dirs 2005-11-20 15:52:52 UTC (rev 2080)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3
+usr/lib/ocaml/3.09.0
Copied: trunk/packages/equeue/trunk/debian/dirs.in (from rev 1562, trunk/packages/equeue/trunk/debian/dirs)
===================================================================
--- trunk/packages/equeue/trunk/debian/dirs 2005-08-01 12:38:14 UTC (rev 1562)
+++ trunk/packages/equeue/trunk/debian/dirs.in 2005-11-20 15:52:52 UTC (rev 2080)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@
Modified: trunk/packages/equeue/trunk/debian/libequeue-gtk2-ocaml-dev.install
===================================================================
--- trunk/packages/equeue/trunk/debian/libequeue-gtk2-ocaml-dev.install 2005-11-20 15:40:21 UTC (rev 2079)
+++ trunk/packages/equeue/trunk/debian/libequeue-gtk2-ocaml-dev.install 2005-11-20 15:52:52 UTC (rev 2080)
@@ -1,5 +1,5 @@
-usr/lib/ocaml/3.08.3/equeue-gtk2/META
-usr/lib/ocaml/3.08.3/equeue-gtk2/*.a
-usr/lib/ocaml/3.08.3/equeue-gtk2/*.o
-usr/lib/ocaml/3.08.3/equeue-gtk2/*.cm*
-usr/lib/ocaml/3.08.3/equeue-gtk2/*.ml*
+usr/lib/ocaml/3.09.0/equeue-gtk2/META
+usr/lib/ocaml/3.09.0/equeue-gtk2/*.a
+usr/lib/ocaml/3.09.0/equeue-gtk2/*.o
+usr/lib/ocaml/3.09.0/equeue-gtk2/*.cm*
+usr/lib/ocaml/3.09.0/equeue-gtk2/*.ml*
Copied: trunk/packages/equeue/trunk/debian/libequeue-gtk2-ocaml-dev.install.in (from rev 1786, trunk/packages/equeue/trunk/debian/libequeue-gtk2-ocaml-dev.install)
===================================================================
--- trunk/packages/equeue/trunk/debian/libequeue-gtk2-ocaml-dev.install 2005-09-21 16:49:55 UTC (rev 1786)
+++ trunk/packages/equeue/trunk/debian/libequeue-gtk2-ocaml-dev.install.in 2005-11-20 15:52:52 UTC (rev 2080)
@@ -0,0 +1,5 @@
+usr/lib/ocaml/@OCamlABI@/equeue-gtk2/META
+usr/lib/ocaml/@OCamlABI@/equeue-gtk2/*.a
+usr/lib/ocaml/@OCamlABI@/equeue-gtk2/*.o
+usr/lib/ocaml/@OCamlABI@/equeue-gtk2/*.cm*
+usr/lib/ocaml/@OCamlABI@/equeue-gtk2/*.ml*
Modified: trunk/packages/equeue/trunk/debian/libequeue-ocaml-dev.install
===================================================================
--- trunk/packages/equeue/trunk/debian/libequeue-ocaml-dev.install 2005-11-20 15:40:21 UTC (rev 2079)
+++ trunk/packages/equeue/trunk/debian/libequeue-ocaml-dev.install 2005-11-20 15:52:52 UTC (rev 2080)
@@ -1,9 +1,9 @@
-usr/lib/ocaml/3.08.3/equeue/META
-usr/lib/ocaml/3.08.3/equeue/*.a
-usr/lib/ocaml/3.08.3/equeue/*.o
-usr/lib/ocaml/3.08.3/equeue/*.cm*
-usr/lib/ocaml/3.08.3/equeue/*.ml*
-usr/lib/ocaml/3.08.3/shell/META
-usr/lib/ocaml/3.08.3/shell/*.a
-usr/lib/ocaml/3.08.3/shell/*.cm*
-usr/lib/ocaml/3.08.3/shell/*.ml*
+usr/lib/ocaml/3.09.0/equeue/META
+usr/lib/ocaml/3.09.0/equeue/*.a
+usr/lib/ocaml/3.09.0/equeue/*.o
+usr/lib/ocaml/3.09.0/equeue/*.cm*
+usr/lib/ocaml/3.09.0/equeue/*.ml*
+usr/lib/ocaml/3.09.0/shell/META
+usr/lib/ocaml/3.09.0/shell/*.a
+usr/lib/ocaml/3.09.0/shell/*.cm*
+usr/lib/ocaml/3.09.0/shell/*.ml*
Copied: trunk/packages/equeue/trunk/debian/libequeue-ocaml-dev.install.in (from rev 1562, trunk/packages/equeue/trunk/debian/libequeue-ocaml-dev.install)
===================================================================
--- trunk/packages/equeue/trunk/debian/libequeue-ocaml-dev.install 2005-08-01 12:38:14 UTC (rev 1562)
+++ trunk/packages/equeue/trunk/debian/libequeue-ocaml-dev.install.in 2005-11-20 15:52:52 UTC (rev 2080)
@@ -0,0 +1,9 @@
+usr/lib/ocaml/@OCamlABI@/equeue/META
+usr/lib/ocaml/@OCamlABI@/equeue/*.a
+usr/lib/ocaml/@OCamlABI@/equeue/*.o
+usr/lib/ocaml/@OCamlABI@/equeue/*.cm*
+usr/lib/ocaml/@OCamlABI@/equeue/*.ml*
+usr/lib/ocaml/@OCamlABI@/shell/META
+usr/lib/ocaml/@OCamlABI@/shell/*.a
+usr/lib/ocaml/@OCamlABI@/shell/*.cm*
+usr/lib/ocaml/@OCamlABI@/shell/*.ml*
Modified: trunk/packages/equeue/trunk/debian/libequeue-ocaml.install
===================================================================
--- trunk/packages/equeue/trunk/debian/libequeue-ocaml.install 2005-11-20 15:40:21 UTC (rev 2079)
+++ trunk/packages/equeue/trunk/debian/libequeue-ocaml.install 2005-11-20 15:52:52 UTC (rev 2080)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3/shell/dllshell.so usr/lib/ocaml/3.08.3/stublibs/
+usr/lib/ocaml/3.09.0/shell/dllshell.so usr/lib/ocaml/3.09.0/stublibs/
Copied: trunk/packages/equeue/trunk/debian/libequeue-ocaml.install.in (from rev 1562, trunk/packages/equeue/trunk/debian/libequeue-ocaml.install)
===================================================================
--- trunk/packages/equeue/trunk/debian/libequeue-ocaml.install 2005-08-01 12:38:14 UTC (rev 1562)
+++ trunk/packages/equeue/trunk/debian/libequeue-ocaml.install.in 2005-11-20 15:52:52 UTC (rev 2080)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/shell/dllshell.so usr/lib/ocaml/@OCamlABI@/stublibs/
Modified: trunk/packages/equeue/trunk/debian/rules
===================================================================
--- trunk/packages/equeue/trunk/debian/rules 2005-11-20 15:40:21 UTC (rev 2079)
+++ trunk/packages/equeue/trunk/debian/rules 2005-11-20 15:52:52 UTC (rev 2080)
@@ -6,9 +6,15 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+
TMPDIR = $(CURDIR)/debian/tmp
DESTDIR = $(TMPDIR)/$(shell ocamlc -where)
+ocamlinit:
+ for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+
config.status: configure
dh_testdir
./configure -with-equeue-gtk2
@@ -62,7 +68,7 @@
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -- -VF:OCamlABI="$(OCAMLABI)"
dh_md5sums
dh_builddeb
More information about the Pkg-ocaml-maint-commits
mailing list