[Pkg-ocaml-maint-commits] [SCM] lablgtkmathview packaging branch, master, updated. debian/0.7.8-5-3-g1710e76

Stephane Glondu steph at glondu.net
Wed Jun 16 00:50:07 UTC 2010


The following commit has been merged in the master branch:
commit 1710e769f67a8680b7f45f053a331cf79f5604e5
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Jun 15 16:13:47 2010 -0700

    Add 0001-Fix-build-with-OCaml-3.12.patch (Closes: #585458)

diff --git a/debian/changelog b/debian/changelog
index ba362bb..6df7c57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,11 @@ lablgtkmathview (0.7.8-6) UNRELEASED; urgency=low
   * Remove inferrable dependencies in debian/control and let dh-ocaml
     do entirely the inference job.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Thu, 25 Feb 2010 16:23:53 +0100
+  [ Stéphane Glondu ]
+  * Switch source package format to 3.0 (quilt)
+  * Add 0001-Fix-build-with-OCaml-3.12.patch (Closes: #585458)
+
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 15 Jun 2010 16:18:23 -0700
 
 lablgtkmathview (0.7.8-5) unstable; urgency=low
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 3bd7637..680cec2 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,4 +2,4 @@
 upstream-branch = upstream
 debian-branch = master
 pristine-tar = True
-
+cleaner = debuild clean && dh_quilt_unpatch && dh_clean
diff --git a/debian/patches/0001-Fix-build-with-OCaml-3.12.patch b/debian/patches/0001-Fix-build-with-OCaml-3.12.patch
new file mode 100644
index 0000000..73294d7
--- /dev/null
+++ b/debian/patches/0001-Fix-build-with-OCaml-3.12.patch
@@ -0,0 +1,22 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 15 Jun 2010 16:02:37 -0700
+Subject: [PATCH] Fix build with OCaml 3.12
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=585458
+---
+ gMathViewAux.mli |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/gMathViewAux.mli b/gMathViewAux.mli
+index 9e47e41..e3f2339 100644
+--- a/gMathViewAux.mli
++++ b/gMathViewAux.mli
+@@ -34,6 +34,7 @@ class single_selection_math_view_signals :
+   ((Gdome.element option -> unit) -> unit) ->
+   object
+     inherit GMathView.math_view_signals
++    val obj : 'b Gtk.obj
+     method selection_changed : (Gdome.element_of_node option -> unit) -> unit
+   end
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1ce4232
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-build-with-OCaml-3.12.patch
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
lablgtkmathview packaging



More information about the Pkg-ocaml-maint-commits mailing list