[Pkg-ocaml-maint-commits] r2419 - trunk/packages/ocamlnet/trunk/debian

[Stefano Zacchiroli]

Author: zack
Date: 2006-01-08 10:29:58 +0000 (Sun, 08 Jan 2006)
New Revision: 2419

Added:
   trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.postinst
Modified:
   trunk/packages/ocamlnet/trunk/debian/changelog
   trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.preinst
Log:
next attempt at proper cleaning of divesions in old ocaml standard library directories


Modified: trunk/packages/ocamlnet/trunk/debian/changelog
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/changelog	2006-01-08 10:10:13 UTC (rev 2418)
+++ trunk/packages/ocamlnet/trunk/debian/changelog	2006-01-08 10:29:58 UTC (rev 2419)
@@ -4,6 +4,9 @@
   * debian/rules
     - clean up of some files not cleaned by upstream's Makefile
       (closes: #346278)
+  * debian/libocamlnet-ocaml-dev.postinst
+    - next attempt at proper cleaning of diversions in the old ocaml
+      standard library directories
 
  -- Stefano Zacchiroli <zack at debian.org>  Sun,  8 Jan 2006 01:36:14 +0100
 

Added: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.postinst
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.postinst	2006-01-08 10:10:13 UTC (rev 2418)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.postinst	2006-01-08 10:29:58 UTC (rev 2419)
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+DIRS=`find /usr/lib/ocaml -maxdepth 1 -type d 2> /dev/null` &&
+for dir in $DIRS; do
+  dir=`echo $dir | sed 's:/$::'`
+  if [ "$dir" != "`ocamlc -where`" ]; then
+    if [ -f "$dir/cgi/META.real" ]; then
+      dpkg-divert --remove "$dir/cgi/META"
+      rm -f "$dir/cgi/META"
+      rmdir -p "$dir/cgi" &> /dev/null
+    elif [ -f "$dir/cgi/META" ]; then
+      rm -f "$dir/cgi/META"
+      rmdir -p "$dir/cgi" &> /dev/null
+    fi
+  fi
+done
+
+#DEBHELPER#

Modified: trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.preinst
===================================================================
--- trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.preinst	2006-01-08 10:10:13 UTC (rev 2418)
+++ trunk/packages/ocamlnet/trunk/debian/libocamlnet-ocaml-dev.preinst	2006-01-08 10:29:58 UTC (rev 2419)
@@ -1,17 +1,5 @@
 #!/bin/bash
 
-DIRS=`find /usr/lib/ocaml -maxdepth 1 -type d 2> /dev/null` &&
-for dir in $DIRS; do
-  dir=`echo $dir | sed 's:/$::'`
-  if [ "$dir" != "`ocamlc -where`" ]; then
-    if [ -f "$dir/cgi/META.real" ]; then
-      dpkg-divert --remove "$dir/cgi/META"
-      rm -f "$dir/cgi/META"
-      rmdir -p "$dir/cgi" &> /dev/null
-    fi
-  fi
-done
-
 if [ install = "$1" -o upgrade = "$1" ]; then
    dpkg-divert --package libocamlnet-ocaml-dev \
       --add --rename --divert \