[Pkg-ocaml-maint-commits] r4594 - in /trunk/packages/ocamlnet/trunk/debian: changelog control patches/00list patches/camlrun_shared.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Fri Sep 28 14:56:51 2007
New Revision: 4594

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4594
Log:
* add patch camlrun_shared to link against libcamlrun_shared, so that the
  apache module becomes PIC. Fix FTBFSs on most non-i386 archs
  (closes: #443150, #444360)
* bump versioned build-dep on ocaml-nox to 3.10.0-9 (the first version
  shipping libcamlrun_shared)

Added:
    trunk/packages/ocamlnet/trunk/debian/patches/camlrun_shared.dpatch   (with props)
Modified:
    trunk/packages/ocamlnet/trunk/debian/changelog
    trunk/packages/ocamlnet/trunk/debian/control
    trunk/packages/ocamlnet/trunk/debian/patches/00list

Modified: trunk/packages/ocamlnet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/changelog?rev=4594&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog (original)
+++ trunk/packages/ocamlnet/trunk/debian/changelog Fri Sep 28 14:56:51 2007
@@ -1,8 +1,13 @@
 ocamlnet (2.2.8.1-4) UNRELEASED; urgency=low
 
   * promote Homepage to a real debian/control field
-
- -- Stefano Zacchiroli <zack at debian.org>  Fri, 21 Sep 2007 10:00:43 +0200
+  * add patch camlrun_shared to link against libcamlrun_shared, so that the
+    apache module becomes PIC. Fix FTBFSs on most non-i386 archs
+    (closes: #443150, #444360)
+  * bump versioned build-dep on ocaml-nox to 3.10.0-9 (the first version
+    shipping libcamlrun_shared)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Fri, 28 Sep 2007 16:30:36 +0200
 
 ocamlnet (2.2.8.1-3) experimental; urgency=low
 

Modified: trunk/packages/ocamlnet/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/control?rev=4594&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/control (original)
+++ trunk/packages/ocamlnet/trunk/debian/control Fri Sep 28 14:56:51 2007
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>> 5.0.0), dpatch, cdbs, ocaml-nox (>= 3.10.0), camlp5 (>= 4.08), ocaml-findlib, libpcre-ocaml-dev (>= 5.11.1), liblablgtk2-ocaml-dev, libcryptgps-ocaml-dev, libssl-ocaml-dev, apache2-mpm-worker, apache2-prefork-dev
+Build-Depends: debhelper (>> 5.0.0), dpatch, cdbs, ocaml-nox (>= 3.10.0-9), camlp5 (>= 4.08), ocaml-findlib, libpcre-ocaml-dev (>= 5.11.1), liblablgtk2-ocaml-dev, libcryptgps-ocaml-dev, libssl-ocaml-dev, apache2-mpm-worker, apache2-prefork-dev
 Standards-Version: 3.7.2
 Homepage: http://ocamlnet.sourceforge.net/
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/ocamlnet

Modified: trunk/packages/ocamlnet/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/00list?rev=4594&op=diff
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/00list (original)
+++ trunk/packages/ocamlnet/trunk/debian/patches/00list Fri Sep 28 14:56:51 2007
@@ -1,3 +1,4 @@
+camlrun_shared.dpatch
 dont_install_gpl.dpatch
 mkdir_destdir.dpatch
 missing_shebangs.dpatch

Added: trunk/packages/ocamlnet/trunk/debian/patches/camlrun_shared.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/ocamlnet/trunk/debian/patches/camlrun_shared.dpatch?rev=4594&op=file
==============================================================================
--- trunk/packages/ocamlnet/trunk/debian/patches/camlrun_shared.dpatch (added)
+++ trunk/packages/ocamlnet/trunk/debian/patches/camlrun_shared.dpatch Fri Sep 28 14:56:51 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## camlrun_shared.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: link against the PIC version of libcamlrun
+
+ at DPATCH@
+diff -urNad trunk~/src/netcgi2-apache/Makefile.def trunk/src/netcgi2-apache/Makefile.def
+--- trunk~/src/netcgi2-apache/Makefile.def	2007-07-31 18:20:59.000000000 +0200
++++ trunk/src/netcgi2-apache/Makefile.def	2007-09-28 16:29:24.000000000 +0200
+@@ -46,7 +46,7 @@
+ ### Embed Caml code into the C code.
+ ### Requires `caml_startup' instead of `caml_main' in handler.c
+ mod_netcgi_apache.so: $(MOD_OBJECTS)
+-	$(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) $(APACHE_OCAMLLIBS)
++	$(APXS) -c -o $@ $^ -L$(APACHE_OCAMLLIBDIR) $(patsubst -lcamlrun,-lcamlrun_shared,$(APACHE_OCAMLLIBS))
+ 	test -f .libs/$@ && cp .libs/$@ .
+ 
+ netcgi_apache_mod.lo: netcgi_apache_mod.o

Propchange: trunk/packages/ocamlnet/trunk/debian/patches/camlrun_shared.dpatch
------------------------------------------------------------------------------
    svn:executable = *