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

[Julien Cristau]

Author: jcristau-guest
Date: 2005-04-16 12:27:54 +0000 (Sat, 16 Apr 2005)
New Revision: 1271

Added:
   trunk/packages/ocaml/trunk/debian/ocaml-base-nox.prerm
Modified:
   trunk/packages/ocaml/trunk/debian/changelog
   trunk/packages/ocaml/trunk/debian/ocaml-base-nox.postinst
Log:
Create directories in /usr/local/lib with proper permissions in
ocaml-base-nox's postinst, and remove them if empty in prerm
(Closes: #270925)


Modified: trunk/packages/ocaml/trunk/debian/changelog
===================================================================
--- trunk/packages/ocaml/trunk/debian/changelog	2005-04-16 12:00:21 UTC (rev 1270)
+++ trunk/packages/ocaml/trunk/debian/changelog	2005-04-16 12:27:54 UTC (rev 1271)
@@ -1,3 +1,11 @@
+ocaml (3.08.3-3+SVN) UNRELEASED; urgency=low
+
+  * Create directories in /usr/local/lib with proper permissions in
+    ocaml-base-nox's postinst, and remove them if empty in prerm
+    (Closes: #270925)
+
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Sat, 16 Apr 2005 14:22:32 +0200
+
 ocaml (3.08.3-3) unstable; urgency=medium
 
   * Missed the include symlink in 3.08 -> 3.08.3 migration.

Modified: trunk/packages/ocaml/trunk/debian/ocaml-base-nox.postinst
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.postinst	2005-04-16 12:00:21 UTC (rev 1270)
+++ trunk/packages/ocaml/trunk/debian/ocaml-base-nox.postinst	2005-04-16 12:27:54 UTC (rev 1271)
@@ -1,9 +1,26 @@
 #!/bin/sh
-mkdir -p /usr/local/lib/ocaml/3.08.3/stublibs || true
+if [ ! -e /usr/local/lib/ocaml ]; then
+    if mkdir /usr/local/lib/ocaml 2>/dev/null; then
+	chown root:staff /usr/local/lib/ocaml
+	chmod 2775 /usr/local/lib/ocaml
+    fi
+fi
+if [ ! -e /usr/local/lib/ocaml/3.08.3 ]; then
+    if mkdir /usr/local/lib/ocaml/3.08.3 2>/dev/null; then
+	chown root:staff /usr/local/lib/ocaml/3.08.3
+	chmod 2775 /usr/local/lib/ocaml/3.08.3
+    fi
+fi
+if [ ! -e /usr/local/lib/ocaml/3.08.3/stublibs ]; then
+    if mkdir /usr/local/lib/ocaml/3.08.3/stublibs 2>/dev/null; then
+	chown root:staff /usr/local/lib/ocaml/3.08.3/stublibs
+	chmod 2775 /usr/local/lib/ocaml/3.08.3/stublibs
+    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";		\
+		echo "Removing leftover $i/ld.conf";		\
 		rm -f $i/ld.conf;				\
 		rmdir --ignore-fail-on-non-empty $i;		\
 	fi;							\

Added: trunk/packages/ocaml/trunk/debian/ocaml-base-nox.prerm
===================================================================
--- trunk/packages/ocaml/trunk/debian/ocaml-base-nox.prerm	2005-04-16 12:00:21 UTC (rev 1270)
+++ trunk/packages/ocaml/trunk/debian/ocaml-base-nox.prerm	2005-04-16 12:27:54 UTC (rev 1271)
@@ -0,0 +1,5 @@
+#!/bin/sh -e
+
+rmdir /usr/local/lib/ocaml/3.08.3/stublibs 2>/dev/null || true
+rmdir /usr/local/lib/ocaml/3.08.3 2>/dev/null || true
+rmdir /usr/local/lib/ocaml 2>/dev/null || true