CVS eclipse/debian

[Stephan Michels]

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

Modified Files:
	changelog control control.in eclipse-platform.dirs 
	eclipse-rcp.postinst 
Added Files:
	eclipse-rcp.prerm 
Log Message:
debian/control.in: eclipse-base: Re-added Depends on gij-4.0 because
its needed for gcj-dbtool.
debian/eclipse-platform.dirs: Removed /usr/local/share/eclipse. Closes: #336884
debian/eclipse-rcp.postinst, debian/eclipse-rcp.prerm:
Create and remove empty directories for /usr/local/lib/eclipse . Closes: #338277
debian/control: eclipse-sdk: Add dependency to eclipse-source, because
the sdk feature explicit depends on the source features. Closed: #338209


--- /cvsroot/pkg-java/eclipse/debian/changelog	2005/11/10 15:16:38	1.24
+++ /cvsroot/pkg-java/eclipse/debian/changelog	2005/11/10 22:24:05	1.25
@@ -1,3 +1,17 @@
+eclipse (3.1.1-6) unstable; urgency=low
+
+  * debian/control.in: eclipse-base: Re-added Depends on gij-4.0 because
+    its needed for gcj-dbtool.
+  * debian/eclipse-platform.dirs: Removed /usr/local/share/eclipse.
+    Closes: #336884
+  * debian/eclipse-rcp.postinst, debian/eclipse-rcp.prerm:
+    Create and remove empty directories for /usr/local/lib/eclipse .
+    Closes: #338277
+  * debian/control: eclipse-sdk: Add dependency to eclipse-source, because
+    the sdk feature explicit depends on the source features. Closed: #338209
+
+ -- Stephan Michels <stephan at apache.org>  Thu, 10 Nov 2005 20:24:17 +0100
+
 eclipse (3.1.1-5) unstable; urgency=low
 
   * Remove gij-4.0 dependency from eclipse-base.
--- /cvsroot/pkg-java/eclipse/debian/control	2005/11/10 15:16:39	1.8
+++ /cvsroot/pkg-java/eclipse/debian/control	2005/11/10 22:24:05	1.9
@@ -8,7 +8,7 @@
 
 Package: eclipse-base
 Architecture: all
-Depends: java-gcj-compat | java-virtual-machine, java-common (>= 0.23), zenity
+Depends: gij-4.0, java-gcj-compat | java-virtual-machine, java-common (>= 0.23), zenity
 Description: Eclipse distribution base
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
@@ -214,7 +214,7 @@
 
 Package: eclipse-sdk
 Architecture: all
-Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version})
+Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
 Description: Extensible Tool Platform and Java IDE
  Package to provide the whole Eclipse SDK, which includes the Java Development
  Tools and Plug-in Development Tools.
--- /cvsroot/pkg-java/eclipse/debian/control.in	2005/11/10 15:16:39	1.7
+++ /cvsroot/pkg-java/eclipse/debian/control.in	2005/11/10 22:24:05	1.8
@@ -8,7 +8,7 @@
 
 Package: eclipse-base
 Architecture: all
-Depends: java-gcj-compat | java-virtual-machine, java-common (>= 0.23), zenity
+Depends: gij-4.0, java-gcj-compat | java-virtual-machine, java-common (>= 0.23), zenity
 Description: Eclipse distribution base
  The Eclipse Platform is an open and extensible platform for anything and yet
  nothing in particular. It provides a foundation for constructing and running
@@ -214,7 +214,7 @@
 
 Package: eclipse-sdk
 Architecture: all
-Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version})
+Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
 Description: Extensible Tool Platform and Java IDE
  Package to provide the whole Eclipse SDK, which includes the Java Development
  Tools and Plug-in Development Tools.
--- /cvsroot/pkg-java/eclipse/debian/eclipse-platform.dirs	2005/10/15 12:29:53	1.1
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-platform.dirs	2005/11/10 22:24:05	1.2
@@ -4,7 +4,4 @@
 usr/share/pixmaps
 usr/share/eclipse/links
 usr/share/lintian/overrides
-usr/local/share/eclipse
-usr/local/share/eclipse/features
-usr/local/share/eclipse/plugins
 etc/eclipse
--- /cvsroot/pkg-java/eclipse/debian/eclipse-rcp.postinst	2005/10/15 12:29:53	1.1
+++ /cvsroot/pkg-java/eclipse/debian/eclipse-rcp.postinst	2005/11/10 22:24:05	1.2
@@ -3,13 +3,23 @@
 #DEBHELPER#
 
 if [ "$1" = "configure" ]; then
+    DIRS="/usr/local/lib/eclipse \
+          /usr/local/lib/eclipse/features \
+          /usr/local/lib/eclipse/plugins"
 
-    # Obsolete local plugin directory. Delete it only if it is completely
-    # empty. This directory has been moved to /usr/local/lib.
-    rm -f /usr/local/share/eclipse/.eclipseextension 2>/dev/null
-    rmdir --ignore-fail-on-non-empty /usr/local/share/eclipse 2>/dev/null
+    # Create empty directories in /usr/local
+    for DIR in $DIRS; do
+        if [ ! -e $DIR ]; then
+            mkdir -p $DIR 2> /dev/null || true
+            chmod 2775 $DIR 2> /dev/null || true
+            chown root:staff $DIR 2> /dev/null || true
+        fi
+    done
+
+    EXT=/usr/local/lib/eclipse/.eclipseextension
+
+    touch $EXT 2>/dev/null
+    chmod 2775 $EXT 2> /dev/null || true
+    chown root:staff $EXT 2> /dev/null || true
 
-    # Create per-machine plugin source directory.
-    mkdir -p /usr/local/lib/eclipse 2>/dev/null
-    touch /usr/local/lib/eclipse/.eclipseextension 2>/dev/null
 fi