[Pkg-ocaml-maint-commits] [SCM] ssreflect packaging branch, master, updated. debian/1.2+dfsg-6-11-g3520703

Stephane Glondu steph at glondu.net
Tue Mar 15 10:35:43 UTC 2011


The following commit has been merged in the master branch:
commit 5d5038eb840168e08e733a172402a3c4a04ce16e
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Mar 9 21:09:46 2011 +0100

    Remove all patches, add patch to fix test-suite

diff --git a/debian/patches/0001-Build-as-a-plugin.patch b/debian/patches/0001-Build-as-a-plugin.patch
deleted file mode 100644
index d9b4188..0000000
--- a/debian/patches/0001-Build-as-a-plugin.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Wed, 26 Aug 2009 17:15:29 +0200
-Subject: [PATCH] Build as a plugin
-
----
- Make                 |    4 +---
- theories/ssreflect.v |    1 +
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Make b/Make
-index 6316b39..ebc79c9 100644
---- a/Make
-+++ b/Make
-@@ -1,8 +1,6 @@
- -I theories 
---custom "$(COQBIN)coqmktop -opt -o bin/ssrcoq src/ssreflect.cmx" "src/ssreflect.cmx" bin/ssrcoq
---custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
-+-I src
- CAMLP4OPTIONS = "-loc loc"
--SSRCOQ = bin/ssrcoq
- theories/automorphism.v
- theories/bigops.v
- theories/binomial.v
-diff --git a/theories/ssreflect.v b/theories/ssreflect.v
-index 4af55ff..bee9110 100644
---- a/theories/ssreflect.v
-+++ b/theories/ssreflect.v
-@@ -1,6 +1,7 @@
- (* (c) Copyright Microsoft Corporation and Inria. You may distribute   *)
- (* under the terms of either the CeCILL-B License or the CeCILL        *)
- (* version 2 License, as specified in the README file.                 *)
-+Declare ML Module "ssreflect".
- Require Import Bool. (* For bool_scope delimiter 'bool'. *)
- 
- (***************************************************************************)
--- 
diff --git a/debian/patches/0001-Fix-tests-Make.patch b/debian/patches/0001-Fix-tests-Make.patch
new file mode 100644
index 0000000..fb4b59f
--- /dev/null
+++ b/debian/patches/0001-Fix-tests-Make.patch
@@ -0,0 +1,20 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 15 Mar 2011 08:40:53 +0100
+Subject: [PATCH] Fix tests' Make
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ test/Make |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/test/Make b/test/Make
+index 502c334..32acd31 100644
+--- a/test/Make
++++ b/test/Make
+@@ -1,5 +1,3 @@
+-SSRCOQ = ../bin/ssrcoq
+--custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo" 
+ -R ../theories Ssreflect
+ -I ../src/
+ absevarprop.v
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index f01bbb5..f38427a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Build-as-a-plugin.patch
+0001-Fix-tests-Make.patch

-- 
ssreflect packaging



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