[Pkg-ocaml-maint-commits] r1684 - trunk/packages/ocaml/trunk/debian

[Jerome Marant]

Author: jerome
Date: 2005-08-23 19:42:22 +0000 (Tue, 23 Aug 2005)
New Revision: 1684

Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/ocaml-nox.NEWS
   trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst
Log:
Handle previous emacs site conffiles

Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-08-23 19:24:48 UTC (rev 1683)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-08-23 19:42:22 UTC (rev 1684)
@@ -17,12 +17,17 @@
     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 at debian.org>  Sat, 20 Aug 2005 13:34:52 +0200

Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.NEWS
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.NEWS	2005-08-23 19:24:48 UTC (rev 1683)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.NEWS	2005-08-23 19:42:22 UTC (rev 1684)
@@ -4,5 +4,11 @@
     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 at debian.org>  Sat, 20 Aug 2005 13:30:25 +0200
 

Modified: trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst	2005-08-23 19:24:48 UTC (rev 1683)
+++ trunk/packages/ocaml/trunk/debian/ocaml-nox.postinst	2005-08-23 19:42:22 UTC (rev 1684)
@@ -9,10 +9,10 @@
 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