[Pkg-ocaml-maint-commits] [SCM] obrowser packaging branch, master, updated. upstream/1.1+dfsg-7-g778f8dc

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 10ca30fa7e9fda715ab86adde8b5a243b3d3955b
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Feb 6 14:54:08 2010 +0100

    Add Do-not-compile-the-scribble-server.patch

diff --git a/debian/patches/0001-Fix-installation-of-dummy-stub-lib.patch b/debian/patches/0001-Fix-installation-of-dummy-stub-lib.patch
index 2016571..f092ee5 100644
--- a/debian/patches/0001-Fix-installation-of-dummy-stub-lib.patch
+++ b/debian/patches/0001-Fix-installation-of-dummy-stub-lib.patch
@@ -3,11 +3,9 @@ Date: Fri, 5 Feb 2010 13:46:37 +0100
 Subject: [PATCH] Fix installation of dummy stub lib
 
 Signed-off-by: Stephane Glondu <steph at glondu.net>
-
 ---
- Makefile          |    2 +-
+ Makefile |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
- mode change 100644 => 100755 rt/caml/Compflags
 
 diff --git a/Makefile b/Makefile
 index bf4ab5d..ba0e22e 100644
diff --git a/debian/patches/0002-Adapt-to-OCaml-3.11.2.patch b/debian/patches/0002-Adapt-to-OCaml-3.11.2.patch
index 9608ced..88eb3d2 100644
--- a/debian/patches/0002-Adapt-to-OCaml-3.11.2.patch
+++ b/debian/patches/0002-Adapt-to-OCaml-3.11.2.patch
@@ -3,7 +3,6 @@ Date: Fri, 5 Feb 2010 14:11:31 +0100
 Subject: [PATCH] Adapt to OCaml 3.11.2
 
 Signed-off-by: Stephane Glondu <steph at glondu.net>
-
 ---
  rt/caml/.depend    |    4 ++--
  rt/caml/buffer.ml  |    8 ++++++++
diff --git a/debian/patches/0003-Install-interfaces-in-text-format.patch b/debian/patches/0003-Install-interfaces-in-text-format.patch
index 43a3d87..291f427 100644
--- a/debian/patches/0003-Install-interfaces-in-text-format.patch
+++ b/debian/patches/0003-Install-interfaces-in-text-format.patch
@@ -3,7 +3,6 @@ Date: Fri, 5 Feb 2010 14:27:27 +0100
 Subject: [PATCH] Install interfaces in text format
 
 Signed-off-by: Stephane Glondu <steph at glondu.net>
-
 ---
  Makefile |    4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0004-More-cleaning.patch b/debian/patches/0004-More-cleaning.patch
index ff8a643..04b84b1 100644
--- a/debian/patches/0004-More-cleaning.patch
+++ b/debian/patches/0004-More-cleaning.patch
@@ -3,7 +3,6 @@ Date: Fri, 5 Feb 2010 15:18:29 +0100
 Subject: [PATCH] More cleaning
 
 Signed-off-by: Stephane Glondu <steph at glondu.net>
-
 ---
  examples/wiki/Makefile |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/debian/patches/0005-Do-not-compile-the-scribble-server.patch b/debian/patches/0005-Do-not-compile-the-scribble-server.patch
new file mode 100644
index 0000000..e641f55
--- /dev/null
+++ b/debian/patches/0005-Do-not-compile-the-scribble-server.patch
@@ -0,0 +1,27 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 6 Feb 2010 14:44:22 +0100
+Subject: [PATCH] Do not compile the scribble server
+
+The scribble server is installed as an example, so we avoid to compile
+potentially architecture-specific files (and avoid issues with
+bytecode architectures).
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ examples/scribble/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/examples/scribble/Makefile b/examples/scribble/Makefile
+index 5e101b3..80a600c 100644
+--- a/examples/scribble/Makefile
++++ b/examples/scribble/Makefile
+@@ -16,7 +16,7 @@
+ 
+ .PHONY: clean
+ 
+-all: main.exe.uue vm.js server
++all: main.exe.uue vm.js
+ 
+ %.exe: %.ml ../../rt/caml/stdlib.cma
+ 	@echo "[OCAMLC] $@"
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 4354d41..5a3f68e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Adapt-to-OCaml-3.11.2.patch
 0003-Install-interfaces-in-text-format.patch
 0004-More-cleaning.patch
+0005-Do-not-compile-the-scribble-server.patch

-- 
obrowser packaging