[Pkg-ocaml-maint-commits] [SCM] ocamlnet packaging branch, master, updated. debian/3.3.5-3-13-g14d755c

Stephane Glondu steph at glondu.net
Fri Sep 2 12:31:18 UTC 2011 

The following commit has been merged in the master branch:
commit d42d627156707ac82e79787ff25f4f9e60ce58de
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Sep 2 13:26:13 2011 +0200

    Refresh patches

diff --git a/debian/patches/Add-rpath-to-Apache-module.patch b/debian/patches/Add-rpath-to-Apache-module.patch
index 49d3f44..0d68abe 100644
--- a/debian/patches/Add-rpath-to-Apache-module.patch
+++ b/debian/patches/Add-rpath-to-Apache-module.patch
@@ -11,10 +11,10 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
-index 655fc3c..94ccf33 100644
+index 7b1bb61..e93bae8 100644
 --- a/src/netcgi2-apache/Makefile.def
 +++ b/src/netcgi2-apache/Makefile.def
-@@ -49,7 +49,7 @@ endif
+@@ -50,7 +50,7 @@ endif
  ### Only works with OCaml >= 3.11 on plafforms where PIC differs from non-PIC
  ### See http://caml.inria.fr/mantis/view.php?id=3866
  mod_netcgi_apache.so: $(MOD_OBJECTS)
diff --git a/debian/patches/Added-missing-shebang-lines-in-example-shell-scripts.patch b/debian/patches/Added-missing-shebang-lines-in-example-shell-scripts.patch
deleted file mode 100644
index ddd501e..0000000
--- a/debian/patches/Added-missing-shebang-lines-in-example-shell-scripts.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Stefano Zacchiroli <zack at debian.org>
-Date: Tue, 6 Oct 2009 15:37:34 +0200
-Subject: Added missing shebang lines in example shell scripts
-
-Signed-off-by: Stefano Zacchiroli <zack at debian.org>
----
- examples/cgi/netcgi2-plex/compile.sh |    1 +
- examples/cgi/netcgi2-plex/run.sh     |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/examples/cgi/netcgi2-plex/compile.sh b/examples/cgi/netcgi2-plex/compile.sh
-index d4aeb1e..1ee873a 100755
---- a/examples/cgi/netcgi2-plex/compile.sh
-+++ b/examples/cgi/netcgi2-plex/compile.sh
-@@ -1,2 +1,3 @@
-+#!/bin/sh
- export OCAMLPATH=../../../src
- make
-diff --git a/examples/cgi/netcgi2-plex/run.sh b/examples/cgi/netcgi2-plex/run.sh
-index fb9cc4e..db6ed56 100755
---- a/examples/cgi/netcgi2-plex/run.sh
-+++ b/examples/cgi/netcgi2-plex/run.sh
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- export LD_LIBRARY_PATH=../../../src/netsys:../../../src/netstring
- export CAML_LD_LIBRARY_PATH=../../../src/netsys:../../../src/netstring
- exec ./netplex -conf netplex.cfg "$@"
--- 
diff --git a/debian/patches/Do-not-install-apache.info-file.patch b/debian/patches/Do-not-install-apache.info-file.patch
index ad9cf40..aa3e23d 100644
--- a/debian/patches/Do-not-install-apache.info-file.patch
+++ b/debian/patches/Do-not-install-apache.info-file.patch
@@ -10,10 +10,10 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
-index 94ccf33..4a520f4 100644
+index e93bae8..9ca5375 100644
 --- a/src/netcgi2-apache/Makefile.def
 +++ b/src/netcgi2-apache/Makefile.def
-@@ -10,7 +10,7 @@ OBJECTS = netcgi_apache.cmo netcgi_modtpl.cmo
+@@ -11,7 +11,7 @@ OBJECTS = netcgi_apache.cmo netcgi_modtpl.cmo
  DOBJECTS = netcgi_apache.mli netcgi_modtpl.mli
  
  ALL_EXTRA = mod_netcgi_apache.so
diff --git a/debian/patches/Force-major-version-for-apache-to-2.patch b/debian/patches/Force-major-version-for-apache-to-2.patch
index 4441284..cf6a55f 100644
--- a/debian/patches/Force-major-version-for-apache-to-2.patch
+++ b/debian/patches/Force-major-version-for-apache-to-2.patch
@@ -12,10 +12,10 @@ Signed-off-by: Stefano Zacchiroli <zack at upsilon.cc>
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index 5ecdf64..965edfd 100755
+index 8bc9721..59ed591 100755
 --- a/configure
 +++ b/configure
-@@ -776,8 +776,8 @@ if [ $enable_apache -gt 0 ]; then
+@@ -777,8 +777,8 @@ if [ $enable_apache -gt 0 ]; then
  	apache=`get_path apache`
      fi
  
diff --git a/debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch b/debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch
index 547489b..ba63bbc 100644
--- a/debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch
+++ b/debian/patches/Link-against-the-PIC-version-of-libcamlrun.patch
@@ -8,10 +8,10 @@ Signed-off-by: Stefano Zacchiroli <zack at debian.org>
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/netcgi2-apache/Makefile.def b/src/netcgi2-apache/Makefile.def
-index e9c1641..655fc3c 100644
+index f191946..7b1bb61 100644
 --- a/src/netcgi2-apache/Makefile.def
 +++ b/src/netcgi2-apache/Makefile.def
-@@ -49,7 +49,7 @@ endif
+@@ -50,7 +50,7 @@ endif
  ### Only works with OCaml >= 3.11 on plafforms where PIC differs from non-PIC
  ### See http://caml.inria.fr/mantis/view.php?id=3866
  mod_netcgi_apache.so: $(MOD_OBJECTS)
diff --git a/debian/patches/Try-also-ocamlc-for-POSIX-threads.patch b/debian/patches/Try-also-ocamlc-for-POSIX-threads.patch
deleted file mode 100644
index 9c5c793..0000000
--- a/debian/patches/Try-also-ocamlc-for-POSIX-threads.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Sun, 24 Jul 2011 15:53:50 +0200
-Subject: Try also ocamlc for POSIX threads
-
-The original test was always forcing -vmthread on bytecode
-architectures...
----
- configure |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 965edfd..2e8e16f 100755
---- a/configure
-+++ b/configure
-@@ -405,7 +405,8 @@ mkdir -p tmp
- cat <<_EOF_ >tmp/t.ml
- let _ = Mutex.create();;
- _EOF_
--if ocamlopt -thread -o tmp/t${exec_suffix} ${OCAMLOPTFLAGS} unix.cmxa threads.cmxa tmp/t.ml 2>/dev/null; then
-+if ocamlopt -thread -o tmp/t${exec_suffix} ${OCAMLOPTFLAGS} unix.cmxa threads.cmxa tmp/t.ml 2>/dev/null ||
-+    ocamlc -thread -o tmp/t${exec_suffix} unix.cma threads.cma tmp/t.ml 2>/dev/null; then
-     if tmp/t${exec_suffix} 2>/dev/null; then
- 	mt_type=posix
- 	mt_switch="-thread"
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 53b2e37..c146caa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,5 @@ Link-against-the-PIC-version-of-libcamlrun.patch
 Add-rpath-to-Apache-module.patch
 Avoid-shipping-GPL-license-text.patch
 Create-installation-directories.patch
-Added-missing-shebang-lines-in-example-shell-scripts.patch
 Do-not-install-apache.info-file.patch
 Force-major-version-for-apache-to-2.patch
-Try-also-ocamlc-for-POSIX-threads.patch

-- 
ocamlnet packaging

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