[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.1.0-2-8-g7c674a7

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c1d66382a4f858aed9a04fa0ed038a5ba078ea3e
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed May 6 15:34:08 2009 +0200

    Various updates in packaging
    
     * install sample configuration files with examples
     * install shared stubs
     * do no longer skip dh_strip

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..d0e6686
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+examples/ocamlduce/exampleduce.o
diff --git a/debian/ocsigen.dirs b/debian/ocsigen.dirs.in
similarity index 87%
rename from debian/ocsigen.dirs
rename to debian/ocsigen.dirs.in
index bb947bb..d569fd4 100644
--- a/debian/ocsigen.dirs
+++ b/debian/ocsigen.dirs.in
@@ -4,3 +4,4 @@ usr/lib/ocsigen
 usr/share/doc/ocsigen
 var/lib/ocsigen
 var/log/ocsigen
+ at OCamlDllDir@
diff --git a/debian/ocsigen.examples b/debian/ocsigen.examples
new file mode 100644
index 0000000..f063f2f
--- /dev/null
+++ b/debian/ocsigen.examples
@@ -0,0 +1 @@
+debian/tmp/etc/ocsigen/*.sample
diff --git a/debian/ocsigen.install b/debian/ocsigen.install.in
similarity index 61%
rename from debian/ocsigen.install
rename to debian/ocsigen.install.in
index ea864fa..3e626c1 100644
--- a/debian/ocsigen.install
+++ b/debian/ocsigen.install.in
@@ -1,4 +1,5 @@
-etc/ocsigen
+etc/ocsigen/mime.types
+etc/ocsigen/ocsigen.conf
 etc/logrotate.d
 usr/bin
 usr/lib/ocsigen
@@ -6,3 +7,4 @@ usr/share/man
 usr/share/ocsigen
 var/lib/ocsigen
 var/log/ocsigen
+ at OCamlDllDir@/*
diff --git a/debian/ocsigen.links b/debian/ocsigen.links
new file mode 100644
index 0000000..b06fc9e
--- /dev/null
+++ b/debian/ocsigen.links
@@ -0,0 +1 @@
+usr/share/man/man1/ocsigen.1.gz		usr/share/man/man1/ocsigen.opt.1.gz
diff --git a/debian/rules b/debian/rules
index d1d3b77..1d22b04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ override_dh_auto_configure:
 	    --staticpagesdir /usr/share \
 	    --ocsigen-user ocsigen \
 	    --ocsigen-group ocsigen \
+	    --stubdir $(OCAML_DLL_DIR) \
 	    --enable-ocamlduce
 	cp -a examples debian
 # Remove irrelevant files (incl. those installed in /usr/share or /var/lib)
@@ -68,9 +69,6 @@ override_dh_auto_clean:
 override_dh_compress:
 	dh_compress -X.ml
 
-override_dh_strip:
-	@echo Skip dh_strip because of -custom
-
 clean: ocamlinit-clean
 	$(DH) $@
 

-- 
ocsigen packaging