[Pkg-ocaml-maint-commits] r2399 - trunk/packages/cairo-ocaml/trunk/debian

[Samuel Mimram]

Author: smimram
Date: 2006-01-07 12:27:03 +0000 (Sat, 07 Jan 2006)
New Revision: 2399

Removed:
   trunk/packages/cairo-ocaml/trunk/debian/control.in
   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
Modified:
   trunk/packages/cairo-ocaml/trunk/debian/changelog
   trunk/packages/cairo-ocaml/trunk/debian/control
   trunk/packages/cairo-ocaml/trunk/debian/rules
Log:
Correct handling of OCaml ABI.

Modified: trunk/packages/cairo-ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/changelog	2006-01-07 12:20:18 UTC (rev 2398)
+++ trunk/packages/cairo-ocaml/trunk/debian/changelog	2006-01-07 12:27:03 UTC (rev 2399)
@@ -1,3 +1,10 @@
+cairo-ocaml (20060107-1) unstable; urgency=low
+
+  * New CVS snapshot.
+  * Correctly handling OCaml ABI in package.
+
+ -- Samuel Mimram <smimram at debian.org>  Sat,  7 Jan 2006 13:22:20 +0100
+
 cairo-ocaml (20051120-1) unstable; urgency=low
 
   * New CVS snapshot.

Modified: trunk/packages/cairo-ocaml/trunk/debian/control
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/control	2006-01-07 12:20:18 UTC (rev 2398)
+++ trunk/packages/cairo-ocaml/trunk/debian/control	2006-01-07 12:27:03 UTC (rev 2399)
@@ -2,7 +2,7 @@
 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.09.0), libcairo2-dev, liblablgtk2-ocaml-dev
+Build-Depends: debhelper (>= 4.0.0), dpatch, automake1.9, autoconf, ocaml-findlib, ocaml-nox (>= 3.09.1), libcairo2-dev, liblablgtk2-ocaml-dev
 Standards-Version: 3.6.2
 
 Package: libcairo-ocaml

Deleted: trunk/packages/cairo-ocaml/trunk/debian/control.in
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/control.in	2006-01-07 12:20:18 UTC (rev 2398)
+++ trunk/packages/cairo-ocaml/trunk/debian/control.in	2006-01-07 12:27:03 UTC (rev 2399)
@@ -1,51 +0,0 @@
-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.

Deleted: trunk/packages/cairo-ocaml/trunk/debian/dirs
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/dirs	2006-01-07 12:20:18 UTC (rev 2398)
+++ trunk/packages/cairo-ocaml/trunk/debian/dirs	2006-01-07 12:27:03 UTC (rev 2399)
@@ -1 +0,0 @@
-usr/lib/ocaml/3.09.0/cairo

Deleted: trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install	2006-01-07 12:20:18 UTC (rev 2398)
+++ trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml-dev.install	2006-01-07 12:27:03 UTC (rev 2399)
@@ -1,4 +0,0 @@
-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*

Deleted: trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install	2006-01-07 12:20:18 UTC (rev 2398)
+++ trunk/packages/cairo-ocaml/trunk/debian/libcairo-ocaml.install	2006-01-07 12:27:03 UTC (rev 2399)
@@ -1,2 +0,0 @@
-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/

Modified: trunk/packages/cairo-ocaml/trunk/debian/rules
===================================================================
--- trunk/packages/cairo-ocaml/trunk/debian/rules	2006-01-07 12:20:18 UTC (rev 2398)
+++ trunk/packages/cairo-ocaml/trunk/debian/rules	2006-01-07 12:27:03 UTC (rev 2399)
@@ -10,7 +10,7 @@
 include /usr/share/dpatch/dpatch.make
 
 OCAMLABI := $(shell ocamlc -version)
-OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+OFILES := $(patsubst %.in,%,$(wildcard debian/*.in))
 
 DESTDIR = $(CURDIR)/debian/tmp
 
@@ -26,7 +26,7 @@
 	chmod +x configure
 	./configure --with-gtk
 
-build: patch-stamp build-stamp
+build: ocamlinit patch-stamp build-stamp
 build-stamp:  config.status
 	dh_testdir
 
@@ -82,4 +82,4 @@
 	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 ocamlinit