[Pkg-ocaml-maint-commits] r2077 - in
trunk/packages/cairo-ocaml/trunk/debian: . patches
Samuel Mimram
smimram-guest at costa.debian.org
Sun Nov 20 15:38:26 UTC 2005
Author: smimram-guest
Date: 2005-11-20 15:38:25 +0000 (Sun, 20 Nov 2005)
New Revision: 2077
Added:
trunk/packages/cairo-ocaml/trunk/debian/control.in
trunk/packages/cairo-ocaml/trunk/debian/dirs.in
trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install.in
trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install.in
Removed:
trunk/packages/cairo-ocaml/trunk/debian/patches/not_align_double.dpatch
Modified:
trunk/packages/cairo-ocaml/trunk/debian/changelog
trunk/packages/cairo-ocaml/trunk/debian/control
trunk/packages/cairo-ocaml/trunk/debian/dirs
trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install
trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install
trunk/packages/cairo-ocaml/trunk/debian/patches/00list
trunk/packages/cairo-ocaml/trunk/debian/rules
Log:
Rebuild with OCaml 3.09.0.
Modified: trunk/packages/cairo-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/changelog 2005-11-18 19:11:07 UTC (rev 2076)
+++ trunk/packages/cairo-ocaml/trunk/debian/changelog 2005-11-20 15:38:25 UTC (rev 2077)
@@ -1,3 +1,11 @@
+cairo-ocaml (20051120-1) unstable; urgency=low
+
+ * New CVS snapshot.
+ * No longer hardcoding OCaml's ABI in control.
+ * Removed not_aligned_double.dpatch, integrated upstream.
+
+ -- Samuel Mimram <smimram at debian.org> Sun, 20 Nov 2005 12:45:42 +0100
+
cairo-ocaml (20050918-5) unstable; urgency=low
* The code breakage on archs where ARCH_ALIGN_DOUBLE is not defined was
Modified: trunk/packages/cairo-ocaml/trunk/debian/control
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/control 2005-11-18 19:11:07 UTC (rev 2076)
+++ trunk/packages/cairo-ocaml/trunk/debian/control 2005-11-20 15:38:25 UTC (rev 2077)
@@ -2,13 +2,13 @@
Section: devel
Priority: optional
Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch, automake1.9, autoconf, ocaml-findlib, ocaml-nox-3.08.3, libcairo2-dev, liblablgtk2-ocaml-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, automake1.9, autoconf, ocaml-findlib, ocaml-nox (>= 3.09.0), libcairo2-dev, liblablgtk2-ocaml-dev
Standards-Version: 3.6.2
Package: libcairo-ocaml
Section: libs
Architecture: any
-Depends: ocaml-base-nox-3.08.3, ${shlibs:Depends}
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
Description: OCaml bindings for Cairo
Cairo is a multi-platform library providing anti-aliased
vector-based rendering for multiple target backends. Paths consist
@@ -29,7 +29,7 @@
Package: libcairo-ocaml-dev
Section: libdevel
Architecture: any
-Depends: ocaml-nox-3.08.3, libcairo2-dev, liblablgtk2-ocaml-dev, libcairo-ocaml (= ${Source-Version})
+Depends: ocaml-nox-${F:OCamlABI}, libcairo2-dev, liblablgtk2-ocaml-dev, libcairo-ocaml (= ${Source-Version})
Suggests: ocaml-findlib
Description: OCaml bindings for Cairo
Cairo is a multi-platform library providing anti-aliased
Copied: trunk/packages/cairo-ocaml/trunk/debian/control.in (from rev 1799, trunk/packages/cairo-ocaml/trunk/debian/control)
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/control 2005-09-30 16:50:46 UTC (rev 1799)
+++ trunk/packages/cairo-ocaml/trunk/debian/control.in 2005-11-20 15:38:25 UTC (rev 2077)
@@ -0,0 +1,51 @@
+Source: cairo-ocaml
+Section: devel
+Priority: optional
+Maintainer: Samuel Mimram <smimram at debian.org>
+Build-Depends: debhelper (>= 4.0.0), dpatch, automake1.9, autoconf, ocaml-findlib, ocaml-nox (>= @OCamlABI@), libcairo2-dev, liblablgtk2-ocaml-dev
+Standards-Version: 3.6.2
+
+Package: libcairo-ocaml
+Section: libs
+Architecture: any
+Depends: ocaml-base-nox-${F:OCamlABI}, ${shlibs:Depends}
+Description: OCaml bindings for Cairo
+ Cairo is a multi-platform library providing anti-aliased
+ vector-based rendering for multiple target backends. Paths consist
+ of line segments and cubic splines and can be rendered at any width
+ with various join and cap styles. All colors may be specified with
+ optional translucence (opacity/alpha) and combined using the
+ extended Porter/Duff compositing algebra as found in the X Render
+ Extension.
+ .
+ Cairo exports a stateful rendering API similar in spirit to the path
+ construction, text, and painting operators of PostScript, (with the
+ significant addition of translucence in the imaging model). When
+ complete, the API is intended to support the complete imaging model of
+ PDF 1.4.
+ .
+ This package contains only the shared runtime stub libraries.
+
+Package: libcairo-ocaml-dev
+Section: libdevel
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, libcairo2-dev, liblablgtk2-ocaml-dev, libcairo-ocaml (= ${Source-Version})
+Suggests: ocaml-findlib
+Description: OCaml bindings for Cairo
+ Cairo is a multi-platform library providing anti-aliased
+ vector-based rendering for multiple target backends. Paths consist
+ of line segments and cubic splines and can be rendered at any width
+ with various join and cap styles. All colors may be specified with
+ optional translucence (opacity/alpha) and combined using the
+ extended Porter/Duff compositing algebra as found in the X Render
+ Extension.
+ .
+ Cairo exports a stateful rendering API similar in spirit to the path
+ construction, text, and painting operators of PostScript, (with the
+ significant addition of translucence in the imaging model). When
+ complete, the API is intended to support the complete imaging model of
+ PDF 1.4.
+ .
+ This package contains all the development stuff you need to use Cairo in
+ your OCaml programs. The folowing backends are supported: PostScript,
+ PDF, PNG, In-memory images and X11.
Modified: trunk/packages/cairo-ocaml/trunk/debian/dirs
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/dirs 2005-11-18 19:11:07 UTC (rev 2076)
+++ trunk/packages/cairo-ocaml/trunk/debian/dirs 2005-11-20 15:38:25 UTC (rev 2077)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3/cairo
+usr/lib/ocaml/3.09.0/cairo
Copied: trunk/packages/cairo-ocaml/trunk/debian/dirs.in (from rev 1796, trunk/packages/cairo-ocaml/trunk/debian/dirs)
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/dirs 2005-09-28 22:54:43 UTC (rev 1796)
+++ trunk/packages/cairo-ocaml/trunk/debian/dirs.in 2005-11-20 15:38:25 UTC (rev 2077)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@/cairo
Modified: trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install 2005-11-18 19:11:07 UTC (rev 2076)
+++ trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install 2005-11-20 15:38:25 UTC (rev 2077)
@@ -1,4 +1,4 @@
-usr/lib/ocaml/3.08.3/cairo/*.a
-usr/lib/ocaml/3.08.3/cairo/*.o
-usr/lib/ocaml/3.08.3/cairo/*.cm*
-usr/lib/ocaml/3.08.3/cairo/*.ml*
+usr/lib/ocaml/3.09.0/cairo/*.a
+usr/lib/ocaml/3.09.0/cairo/*.o
+usr/lib/ocaml/3.09.0/cairo/*.cm*
+usr/lib/ocaml/3.09.0/cairo/*.ml*
Copied: trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install.in (from rev 1781, trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install)
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install 2005-09-18 18:30:29 UTC (rev 1781)
+++ trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install.in 2005-11-20 15:38:25 UTC (rev 2077)
@@ -0,0 +1,4 @@
+usr/lib/ocaml/@OCamlABI@/cairo/*.a
+usr/lib/ocaml/@OCamlABI@/cairo/*.o
+usr/lib/ocaml/@OCamlABI@/cairo/*.cm*
+usr/lib/ocaml/@OCamlABI@/cairo/*.ml*
Modified: trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install 2005-11-18 19:11:07 UTC (rev 2076)
+++ trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install 2005-11-20 15:38:25 UTC (rev 2077)
@@ -1,2 +1,2 @@
-usr/lib/ocaml/3.08.3/cairo/dllmlcairo.so usr/lib/ocaml/3.08.3/stublibs/
-usr/lib/ocaml/3.08.3/cairo/dllmlcairo_lablgtk.so usr/lib/ocaml/3.08.3/stublibs/
+usr/lib/ocaml/3.09.0/cairo/dllmlcairo.so usr/lib/ocaml/3.09.0/stublibs/
+usr/lib/ocaml/3.09.0/cairo/dllmlcairo_lablgtk.so usr/lib/ocaml/3.09.0/stublibs/
Copied: trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install.in (from rev 1781, trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install)
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install 2005-09-18 18:30:29 UTC (rev 1781)
+++ trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install.in 2005-11-20 15:38:25 UTC (rev 2077)
@@ -0,0 +1,2 @@
+usr/lib/ocaml/@OCamlABI@/cairo/dllmlcairo.so usr/lib/ocaml/@OCamlABI@/stublibs/
+usr/lib/ocaml/@OCamlABI@/cairo/dllmlcairo_lablgtk.so usr/lib/ocaml/@OCamlABI@/stublibs/
Modified: trunk/packages/cairo-ocaml/trunk/debian/patches/00list
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/patches/00list 2005-11-18 19:11:07 UTC (rev 2076)
+++ trunk/packages/cairo-ocaml/trunk/debian/patches/00list 2005-11-20 15:38:25 UTC (rev 2077)
@@ -1 +0,0 @@
-not_align_double
Deleted: trunk/packages/cairo-ocaml/trunk/debian/patches/not_align_double.dpatch
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/patches/not_align_double.dpatch 2005-11-18 19:11:07 UTC (rev 2076)
+++ trunk/packages/cairo-ocaml/trunk/debian/patches/not_align_double.dpatch 2005-11-20 15:38:25 UTC (rev 2077)
@@ -1,50 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## not_align_double.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix various code issues on archs where ARCH_ALIGN_DOUBLE is not defined,
-## DP: obviously this code was not tested recently...
-
- at DPATCH@
-diff -urNad cairo-ocaml-20050918~/src/ml_cairo.c cairo-ocaml-20050918/src/ml_cairo.c
---- cairo-ocaml-20050918~/src/ml_cairo.c 2005-10-06 13:50:14.000000000 +0200
-+++ cairo-ocaml-20050918/src/ml_cairo.c 2005-10-06 13:50:17.000000000 +0200
-@@ -70,11 +70,11 @@
- Double_array_length (d), Double_val (off));
- #else
- int i, ndash = Double_array_length (d);
-- double *dashes = stat_alloc (ndash * sizeof (double));
-- for (i = 0; i < ndash, i++)
-+ double *dashes = caml_stat_alloc (ndash * sizeof (double));
-+ for (i = 0; i < ndash; i++)
- dashes[i] = Double_field (d, i);
- cairo_set_dash (cairo_t_val (cr), dashes, ndash, Double_val (off));
-- stat_free (dashes);
-+ caml_stat_free (dashes);
- #endif
- check_cairo_status (cr);
- return Val_unit;
-diff -urNad cairo-ocaml-20050918~/src/ml_cairo_matrix.c cairo-ocaml-20050918/src/ml_cairo_matrix.c
---- cairo-ocaml-20050918~/src/ml_cairo_matrix.c 2005-09-18 20:18:51.000000000 +0200
-+++ cairo-ocaml-20050918/src/ml_cairo_matrix.c 2005-10-06 13:50:53.000000000 +0200
-@@ -87,7 +87,7 @@
- #else
- cairo_matrix_t mat;
- ml_convert_cairo_matrix_in (m, &mat);
-- cairo_matrix_rotate (&mat, Double_val (a);
-+ cairo_matrix_rotate (&mat, Double_val (a));
- return ml_convert_cairo_matrix_out (&mat);
- #endif
- }
-diff -urNad cairo-ocaml-20050918~/src/ml_cairo_pattern.c cairo-ocaml-20050918/src/ml_cairo_pattern.c
---- cairo-ocaml-20050918~/src/ml_cairo_pattern.c 2005-10-06 13:50:14.000000000 +0200
-+++ cairo-ocaml-20050918/src/ml_cairo_pattern.c 2005-10-06 13:50:17.000000000 +0200
-@@ -85,7 +85,7 @@
- cairo_matrix_t mat;
- cairo_pattern_get_matrix (cairo_pattern_t_val (p), &mat);
- check_pattern_status (p);
-- return ml_convert_cairo_matrix_out (m, &mat);
-+ return ml_convert_cairo_matrix_out (&mat);
- #else
- CAMLparam1(p);
- value m = caml_alloc_small (6 * Double_wosize, Double_array_tag);
Modified: trunk/packages/cairo-ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/rules 2005-11-18 19:11:07 UTC (rev 2076)
+++ trunk/packages/cairo-ocaml/trunk/debian/rules 2005-11-20 15:38:25 UTC (rev 2077)
@@ -9,8 +9,14 @@
# We want to use dpatch
include /usr/share/dpatch/dpatch.make
+OCAMLABI := $(shell ocamlc -version)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+
DESTDIR = $(CURDIR)/debian/tmp
+ocamlinit:
+ for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/g' $$f.in > $$f; done
+
configure:
aclocal -I support
autoconf
@@ -35,6 +41,7 @@
dh_testroot
rm -f build-stamp
+ -$(MAKE) clean
-$(MAKE) distclean
dh_clean
@@ -70,7 +77,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