[Pkg-ocaml-maint-commits] r4484 - in /trunk/packages/ocaml-ao/trunk/debian: changelog control patches/00list patches/camlp4.dpatch rules

[smimram at users.alioth.debian.org]

Author: smimram
Date: Sun Sep  9 16:03:08 2007
New Revision: 4484

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4484
Log:
Rebuild with OCaml 3.10.

Added:
    trunk/packages/ocaml-ao/trunk/debian/patches/camlp4.dpatch   (with props)
Modified:
    trunk/packages/ocaml-ao/trunk/debian/changelog
    trunk/packages/ocaml-ao/trunk/debian/control
    trunk/packages/ocaml-ao/trunk/debian/patches/00list
    trunk/packages/ocaml-ao/trunk/debian/rules

Modified: trunk/packages/ocaml-ao/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/changelog?rev=4484&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/changelog (original)
+++ trunk/packages/ocaml-ao/trunk/debian/changelog Sun Sep  9 16:03:08 2007
@@ -1,3 +1,10 @@
+ocaml-ao (0.1.7.1-4) unstable; urgency=low
+
+  * Rebuild with OCaml 3.10.
+  * Added camlp4.dpatch in order to adapt to new camlp4.
+
+ -- Samuel Mimram <smimram at debian.org>  Sun, 09 Sep 2007 18:00:34 +0200
+
 ocaml-ao (0.1.7.1-3) unstable; urgency=low
 
   * Using dpatch to handle patches.

Modified: trunk/packages/ocaml-ao/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/control?rev=4484&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/control (original)
+++ trunk/packages/ocaml-ao/trunk/debian/control Sun Sep  9 16:03:08 2007
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Samuel Mimram <smimram at debian.org>
-Build-Depends: debhelper (>> 4.0.0), libao-dev, ocaml-nox (>= 3.08.3), ocaml-findlib, pkg-config, dpkg-dev (>= 1.13.19), dpatch
+Build-Depends: debhelper (>> 4.0.0), libao-dev, ocaml-nox (>= 3.10), camlp4, ocaml-findlib, pkg-config, dpkg-dev (>= 1.13.19), dpatch
 Standards-Version: 3.7.2
 
 Package: libao-ocaml

Modified: trunk/packages/ocaml-ao/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/patches/00list?rev=4484&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/patches/00list (original)
+++ trunk/packages/ocaml-ao/trunk/debian/patches/00list Sun Sep  9 16:03:08 2007
@@ -1,1 +1,2 @@
 install
+camlp4

Added: trunk/packages/ocaml-ao/trunk/debian/patches/camlp4.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/patches/camlp4.dpatch?rev=4484&op=file
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/patches/camlp4.dpatch (added)
+++ trunk/packages/ocaml-ao/trunk/debian/patches/camlp4.dpatch Sun Sep  9 16:03:08 2007
@@ -1,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## camlp4.dpatch by Samuel Mimram <smimram at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update to build with OCaml 3.10's camlp4.
+
+ at DPATCH@
+diff -urNad ocaml-ao-0.1.7.1~/src/ao.ml ocaml-ao-0.1.7.1/src/ao.ml
+--- ocaml-ao-0.1.7.1~/src/ao.ml	2007-03-02 14:56:19.000000000 +0100
++++ ocaml-ao-0.1.7.1/src/ao.ml	2007-09-09 17:59:33.000000000 +0200
+@@ -19,9 +19,9 @@
+ 
+ *)
+ 
+-type t = 'a;
++type t;
+ 
+-type driver_t = 'b;
++type driver_t;
+ 
+ type driver_kind_t = 
+   [= `LIVE | `FILE | `UNKNOWN ];
+diff -urNad ocaml-ao-0.1.7.1~/src/ao.mli ocaml-ao-0.1.7.1/src/ao.mli
+--- ocaml-ao-0.1.7.1~/src/ao.mli	2007-03-02 14:56:19.000000000 +0100
++++ ocaml-ao-0.1.7.1/src/ao.mli	2007-09-09 17:59:53.000000000 +0200
+@@ -19,7 +19,7 @@
+ *)
+ 
+ (** Device type. *)
+-type t = 'a;
++type t;
+ 
+ (** Which kind of driver? *)
+ type driver_kind_t = [= `LIVE | `FILE | `UNKNOWN ];
+@@ -28,7 +28,7 @@
+ type byte_format_t = [= `LITTLE_ENDIAN | `BIG_ENDIAN | `NATIVE | `UNKNOWN ];
+ 
+ (** Driver type (private). *)
+-type driver_t = 'b;
++type driver_t;
+ 
+ (** Get default driver *)
+ value get_default_driver : unit -> driver_t;

Propchange: trunk/packages/ocaml-ao/trunk/debian/patches/camlp4.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/ocaml-ao/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocaml-ao/trunk/debian/rules?rev=4484&op=diff
==============================================================================
--- trunk/packages/ocaml-ao/trunk/debian/rules (original)
+++ trunk/packages/ocaml-ao/trunk/debian/rules Sun Sep  9 16:03:08 2007
@@ -49,7 +49,7 @@
 	dh_testroot
 	rm -f build-stamp
 
-	-$(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) distclean
 
 	dh_clean