From b7ab5cc545e9b51595defc29a9a701a4444dc9cb Mon Sep 17 00:00:00 2001
From: Stephane Glondu <steph@glondu.net>
Date: Tue, 28 Dec 2021 11:03:44 +0100
Subject: [PATCH] Adapt maintainer scripts to new binary package structure

---
 ...se-nox.postinst.in => ocaml-base.postinst.in} |  9 ---------
 ...aml-base-nox.prerm.in => ocaml-base.prerm.in} |  0
 debian/ocaml-nox.postinst.in                     | 16 ----------------
 debian/ocaml.postinst.in                         |  8 ++++++++
 debian/{ocaml-nox.postrm => ocaml.postrm}        |  0
 debian/{ocaml-nox.preinst => ocaml.preinst}      |  0
 6 files changed, 8 insertions(+), 25 deletions(-)
 rename debian/{ocaml-base-nox.postinst.in => ocaml-base.postinst.in} (73%)
 rename debian/{ocaml-base-nox.prerm.in => ocaml-base.prerm.in} (100%)
 delete mode 100644 debian/ocaml-nox.postinst.in
 create mode 100644 debian/ocaml.postinst.in
 rename debian/{ocaml-nox.postrm => ocaml.postrm} (100%)
 rename debian/{ocaml-nox.preinst => ocaml.preinst} (100%)

diff --git a/debian/ocaml-base-nox.postinst.in b/debian/ocaml-base.postinst.in
similarity index 73%
rename from debian/ocaml-base-nox.postinst.in
rename to debian/ocaml-base.postinst.in
index 8cab4291..98ce5bb5 100644
--- a/debian/ocaml-base-nox.postinst.in
+++ b/debian/ocaml-base.postinst.in
@@ -20,13 +20,4 @@ if [ ! -e /usr/local/lib/ocaml/@OCamlABI@/stublibs ]; then
     fi
 fi
 
-for i in /usr/lib/ocaml/3.06 /etc/ocaml /var/lib/ocaml; 		\
-do									\
-	if [ -e $i/ld.conf ]; then					\
-		echo "Removing leftover $i/ld.conf";			\
-		rm -f $i/ld.conf;					\
-		rmdir --ignore-fail-on-non-empty $i;			\
-	fi;								\
-done
-
 #DEBHELPER#
diff --git a/debian/ocaml-base-nox.prerm.in b/debian/ocaml-base.prerm.in
similarity index 100%
rename from debian/ocaml-base-nox.prerm.in
rename to debian/ocaml-base.prerm.in
diff --git a/debian/ocaml-nox.postinst.in b/debian/ocaml-nox.postinst.in
deleted file mode 100644
index 8e32f2fb..00000000
--- a/debian/ocaml-nox.postinst.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "configure" ]; then
-  ln -sf @OCamlStdlibDir@/caml /usr/include/
-
-  # 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.postinst.in b/debian/ocaml.postinst.in
new file mode 100644
index 00000000..156f5d66
--- /dev/null
+++ b/debian/ocaml.postinst.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+  ln -sf @OCamlStdlibDir@/caml /usr/include/
+fi
+
+#DEBHELPER#
diff --git a/debian/ocaml-nox.postrm b/debian/ocaml.postrm
similarity index 100%
rename from debian/ocaml-nox.postrm
rename to debian/ocaml.postrm
diff --git a/debian/ocaml-nox.preinst b/debian/ocaml.preinst
similarity index 100%
rename from debian/ocaml-nox.preinst
rename to debian/ocaml.preinst
-- 
2.30.2