[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. upstream/1.2.1-11-g2220e37

Stephane Glondu steph at glondu.net
Wed Oct 8 16:05:09 UTC 2008


The following commit has been merged in the master branch:
commit 2220e372fa67fc6c8a5f1bfed9c55286ad60c49f
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Oct 8 17:55:18 2008 +0200

    Remove pcre dependency from META file
    
    With pcre in the META file, nurpawiki needs access to pcre's META
    file. However, pcre is already used by the server, hence statically
    linked into ocsigen. This patch allows nurpawiki to be loaded without
    pcre's META file installed.

diff --git a/debian/rules b/debian/rules
index 25cccb5..a5d3e3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,8 +21,11 @@ install: install-stamp
 install-stamp: build-stamp
 	install -d $(OCAMLFIND_DESTDIR)
 	dh install
-	# Fix ugly permissions
+# Fix ugly permissions
 	chmod 644 debian/nurpawiki/usr/share/ocsigen/nurpawiki/*.png
+# Small hack to prevent a runtime dependency on libpcre-ocaml which is
+# statically linked in ocsigen
+	sed -i 's/,pcre//' $(OCAMLFIND_DESTDIR)/nurpawiki/META
 	touch $@
 
 clean: unpatch

-- 
nurpawiki packaging



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