CVS eclipse/debian

[Stephan Michels]

Update of /cvsroot/pkg-java/eclipse/debian
In directory haydn:/tmp/cvs-serv697

Modified Files:
	changelog eclipse-rcp.prerm 
Log Message:
* debian/eclipse-rcp.prerm: Fix the deletion of the eclipse
  directories in /usr/local/lib, so that it doesn't fail if they are not
  empty. Closes: 342338


--- /cvsroot/pkg-java/eclipse/debian/changelog	2005/12/10 12:06:48	1.35
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2005/12/10 22:33:35	1.36
@@ -1,8 +1,11 @@
 eclipse (3.1.1-7) unstable; urgency=low
 
   * debian/copyright: Updated license to EPL 1.0. Closes: #342695
+  * debian/eclipse-rcp.prerm: Fix the deletion of the eclipse 
+    directories in /usr/local/lib, so that it doesn't fail if they are not 
+    empty. Closes: 342338
 
- -- Stephan Michels <stephan at apache.org>  Sat, 10 Dec 2005 12:57:31 +0100
+ -- Stephan Michels <stephan at apache.org>  Sat, 10 Dec 2005 23:26:43 +0100
 
 eclipse (3.1.1-6) unstable; urgency=low
 
--- /cvsroot/pkg-java/eclipse/debian/eclipse-rcp.prerm	2005/11/13 10:38:36	1.3
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-rcp.prerm	2005/12/10 22:33:39	1.4
@@ -1,17 +1,12 @@
 #! /bin/sh -e
 
-EXT=/usr/local/lib/eclipse/.eclipseextension
-
-rm -f $EXT 2>/dev/null
-
-DIRS="/usr/local/lib/eclipse/features \
-      /usr/local/lib/eclipse/plugins \
-      /usr/local/lib/eclipse"
-
 # Remove empty directories in /usr/local
-for DIR in $DIRS; do
-    rmdir $DIR 2>/dev/null
-done
+
+rmdir /usr/local/lib/eclipse/features 2>/dev/null && \
+  rmdir /usr/local/lib/eclipse/plugins 2>/dev/null && \
+  rm /usr/local/lib/eclipse/.eclipseextension 2>/dev/null && \
+  rmdir /usr/local/lib/eclipse 2>/dev/null || \
+  true
 
 
 # dh_installdeb will replace this with shell code automatically