Handle previous emacs site conffiles

diff --git a/debian/changelog b/debian/changelog
index 2b4c0365bea5bfe02f26937ecc3f3af578076d75..b655e8e84ab7f7def4ff12d21c276a84fcc4ee18 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,12 +17,17 @@ ocaml (3.08.3-8) UNRELEASED; urgency=low
     debian/ocaml-mode.emacsen-remove,
     debian/ocaml-mode.emacsen-startup: New files respectively renamed from
     emacsen-install, emacsen-remove and emacsen-startup
+  * debian/ocaml-nox.postint: Rename previous existing emacs site
+    conffiles to <file>.save in order to avoid messing with the new
+    ocaml-mode 
   * debian/rules: Install ocaml-mode files in their own location
   * debian/ocaml-base-nox.README.Debian: Mention new ocaml-mode package
   * debian/ocaml-nox.NEWS:
     - New file
     - Mention all emacs-related files moved to a separate ocaml-mode
       package
+    - Mention that all previous emacs conffiles are renamed in order
+      not to mess with the new ocaml-mode
   * debian/changelog: Remove spurious changelog entry
 
  -- Jerome Marant <jerome@debian.org>  Sat, 20 Aug 2005 13:34:52 +0200

diff --git a/debian/ocaml-nox.NEWS b/debian/ocaml-nox.NEWS
index 471bb96430858e4ad36be22451e5ac58b2387b15..f0ed46883380eb64e2a34bb4e03774751dd949d7 100644 (file)
--- a/debian/ocaml-nox.NEWS
+++ b/debian/ocaml-nox.NEWS
@@ -4,5 +4,11 @@ ocaml-nox (3.08.3-8) unstable; urgency=low
     programs which is shipped with ocaml has been moved to its own
     `ocaml-mode' package.
 
+  * If found, previous Emacs site conffiles called
+    /etc/emacs/site-start.d/50ocaml.el and
+    /etc/emacs/site-start.d/50ocaml-nox.el are renamed to
+    <file>.save in order not to mess with the site conffile from
+    the new `ocaml-mode' package.
+
  -- Jerome Marant <jerome@debian.org>  Sat, 20 Aug 2005 13:30:25 +0200
 

diff --git a/debian/ocaml-nox.postinst b/debian/ocaml-nox.postinst
index 64c06234a79f9a704efead94c8302b5b9d09cb57..56bef73b56ebacfc04c77edbb6c285f45acfbd78 100644 (file)
--- a/debian/ocaml-nox.postinst
+++ b/debian/ocaml-nox.postinst
@@ -9,10 +9,10 @@ ln -sf ../ocaml-base-nox/ocaml_packaging_policy.gz /usr/share/doc/ocaml-nox
 if [ "$1" = "configure" ]; then
   ocaml-md5sums update
 
-  # Get rid of Emacs conffiles from previous ocaml versions
+  # Save Emacs conffiles from previous ocaml versions
   for f in ocaml ocaml-nox ; do
-    [ -e "/etc/emacs/site-start.d/50$f.el" ] && \
-      rm -f "/etc/emacs/site-start.d/50$f.el"
+    file="/etc/emacs/site-start.d/50$f.el"
+    [ -e "$file" ] && mv "$file" "$file.save"
   done
 fi