From: Samuel Mimram <smimram@debian.org>
Date: Sun, 23 Jul 2006 15:57:51 +0000 (+0000)
Subject: /usr/include/caml is back in postinst, uploading.
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~627
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d8af9e158bd7516718e1f87d948f007560b92622;p=ocaml.git

/usr/include/caml is back in postinst, uploading.
---

diff --git a/debian/changelog b/debian/changelog
index 464792ae..d267c508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-ocaml (3.09.2-6) UNRELEASED; urgency=low
+ocaml (3.09.2-6) unstable; urgency=low
 
-  [ Samuel Mimram ]
-  * Correct /usr/include/caml symbolic link (Closes: #379271).
+  * Correct /usr/include/caml symbolic link, closes: #379271.
   * Correct symbolic links in documentation directories.
+  * Updated policy.
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Sun, 23 Jul 2006 12:42:18 +0200
+ -- Samuel Mimram <smimram@debian.org>  Sun, 23 Jul 2006 14:37:36 +0000
 
 ocaml (3.09.2-5) unstable; urgency=low
 
diff --git a/debian/ocaml-nox.postinst b/debian/ocaml-nox.postinst
deleted file mode 100644
index b0248131..00000000
--- a/debian/ocaml-nox.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -e
-
-if [ "$1" = "configure" ]; then
-  ocaml-md5sums update
-
-  # Save Emacs conffiles from previous ocaml versions
-  for f in ocaml ocaml-nox ; do
-    file="/etc/emacs/site-start.d/50$f.el"
-    if [ -e "$file" ]; then
-      mv "$file" "$file.save"
-    fi
-  done
-fi
-
-#DEBHELPER#
diff --git a/debian/ocaml-nox.postinst.in b/debian/ocaml-nox.postinst.in
new file mode 100644
index 00000000..eecb8764
--- /dev/null
+++ b/debian/ocaml-nox.postinst.in
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+  ln -sf /usr/lib/ocaml/#OcamlABI#/caml /usr/include/
+
+  ocaml-md5sums update
+
+  # Save Emacs conffiles from previous ocaml versions
+  for f in ocaml ocaml-nox ; do
+    file="/etc/emacs/site-start.d/50$f.el"
+    if [ -e "$file" ]; then
+      mv "$file" "$file.save"
+    fi
+  done
+fi
+
+#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index f7b3d199..3bbefa2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -241,8 +241,7 @@ install-arch: build-arch
 	# Remove .opt manpages from ocaml-nox
 	rm -f debian/ocaml-nox/usr/share/man/man1/*.opt.1
 
-	# make some symbolic links
-	cd debian/ocaml-nox/usr/include; ln -sf /usr/lib/ocaml/$(OCAMLABI)/caml .
+	# Make some symbolic links
 	cd debian/ocaml-native-compilers/usr/share/man/man1; \
 		ln -sf /usr/share/man/man1/ocamlc.1.gz ocamlc.opt.1.gz; \
 		ln -sf /usr/share/man/man1/ocamlopt.1.gz ocamlopt.opt.1.gz; \