[pkg-java] r2869 - in trunk/eclipse/debian: . extra
Matthias Klose
doko at alioth.debian.org
Wed Dec 20 01:09:41 CET 2006
Author: doko
Date: 2006-12-20 01:09:30 +0100 (Wed, 20 Dec 2006)
New Revision: 2869
Modified:
trunk/eclipse/debian/changelog
trunk/eclipse/debian/control
trunk/eclipse/debian/control.in
trunk/eclipse/debian/eclipse-rcp.postinst
trunk/eclipse/debian/extra/eclipse.sh
Log:
eclipse (3.2.1-3) unstable; urgency=low
[ Vladim?\195?\173r Lap?\195?\161?\196?\141ek ]
* debian/patches/eclipse-tomcat55-dpatch: link to mx4j-jmx.jar
rather then to jmx.jar.
[ Matthias Klose ]
* Unconditionally depend on zenity. Closes: #403204.
-- Matthias Klose <doko at debian.org> Wed, 20 Dec 2006 01:10:10 +0100
eclipse (3.2.1-2) unstable; urgency=low
[ Matthias Klose ]
* libswt3.2-gtk-jni: Add conflict with duplicate copy in the
Debian archive. Closes: #401819.
-- Matthias Klose <doko at debian.org> Wed, 6 Dec 2006 13:45:37 +0100
Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog 2006-12-18 17:41:03 UTC (rev 2868)
+++ trunk/eclipse/debian/changelog 2006-12-20 00:09:30 UTC (rev 2869)
@@ -1,13 +1,16 @@
-eclipse (3.2.1-3) UNRELEASED; urgency=low
+eclipse (3.2.1-3) unstable; urgency=low
[ Vladimír Lapáček ]
* debian/patches/eclipse-tomcat55-dpatch: link to mx4j-jmx.jar
rather then to jmx.jar.
- -- Stephan Michels <stephan at apache.org> Sat, 16 Dec 2006 10:02:05 +0100
+ [ Matthias Klose ]
+ * Unconditionally depend on zenity. Closes: #403204.
-eclipse (3.2.1-2) UNRELEASED; urgency=low
+ -- Matthias Klose <doko at debian.org> Wed, 20 Dec 2006 01:10:10 +0100
+eclipse (3.2.1-2) unstable; urgency=low
+
[ Matthias Klose ]
* libswt3.2-gtk-jni: Add conflict with duplicate copy in the
Debian archive. Closes: #401819.
Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control 2006-12-18 17:41:03 UTC (rev 2868)
+++ trunk/eclipse/debian/control 2006-12-20 00:09:30 UTC (rev 2869)
@@ -53,7 +53,7 @@
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), libtomcat5.5-java
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), libtomcat5.5-java
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
@@ -158,7 +158,7 @@
Package: eclipse
Architecture: any
-Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
+Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version}), zenity
Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
Recommends: eclipse-gcj
Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2)
Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in 2006-12-18 17:41:03 UTC (rev 2868)
+++ trunk/eclipse/debian/control.in 2006-12-20 00:09:30 UTC (rev 2869)
@@ -53,7 +53,7 @@
Package: eclipse-platform
Architecture: any
-Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), @TOMCAT_DEP@
+Depends: java-gcj-compat | java1-runtime | java2-runtime, java-common (>= 0.23), zenity, zenity | kdebase-bin | xdialog, eclipse-rcp (= ${Source-Version}), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), libjsch-java (>= 0.1.28), @TOMCAT_DEP@
Recommends: eclipse-platform-gcj, eclipse
Replaces: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
Conflicts: libeclipse-jni, eclipse-source (<= 3.1.1-3), eclipse-platform-common
@@ -158,7 +158,7 @@
Package: eclipse
Architecture: any
-Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
+Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version}), zenity
Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
Recommends: eclipse-gcj
Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2)
Modified: trunk/eclipse/debian/eclipse-rcp.postinst
===================================================================
--- trunk/eclipse/debian/eclipse-rcp.postinst 2006-12-18 17:41:03 UTC (rev 2868)
+++ trunk/eclipse/debian/eclipse-rcp.postinst 2006-12-20 00:09:30 UTC (rev 2869)
@@ -16,9 +16,9 @@
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
+ #touch $EXT 2>/dev/null
+ #chmod 2775 $EXT 2> /dev/null || true
+ #chown root:staff $EXT 2> /dev/null || true
fi
Modified: trunk/eclipse/debian/extra/eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/eclipse.sh 2006-12-18 17:41:03 UTC (rev 2868)
+++ trunk/eclipse/debian/extra/eclipse.sh 2006-12-20 00:09:30 UTC (rev 2869)
@@ -13,14 +13,19 @@
if [ -x /usr/bin/zenity ]; then
DIALOG=/usr/bin/zenity
+ DIALOGW="$DIALOG --warning"
elif [ -x /usr/bin/kdialog ]; then
DIALOG=/usr/bin/kdialog
+ DIALOGW="$DIALOG --warningyesno"
elif [ -x /usr/bin/xdialog ]; then
DIALOG=/usr/bin/xdialog
+ DIALOGW="$DIALOG --warning"
else
DIALOG=echo
+ DIALOGW="$DIALOG"
fi
+
# Make sure this directory exists.
if [ ! -d ~/.eclipse ]; then
mkdir ~/.eclipse > /dev/null 2>&1
@@ -138,13 +143,26 @@
elif [ -e /usr/lib/mozilla/libgtkembedmoz.so ]; then
export MOZILLA_FIVE_HOME=/usr/lib/mozilla
else
- $DIALOG \
- --warning \
+ $DIALOGW \
--title="Integrated browser support not working" \
--text="This Eclipse build doesn't have support for the integrated browser."
[ $? -eq 0 ] || exit 1
fi
+EXT=/usr/local/lib/eclipse/.eclipseextension
+if [ ! -f $EXT ]; then
+ if ! touch $EXT 2>/dev/null; then
+ cat <<-EOF
+ Could not create $EXT. Please run as root:
+ touch $EXT
+ chmod 2775 $EXT
+ chown root:staff $EXT
+ EOF
+ fi
+ chmod 2775 $EXT 2> /dev/null || true
+ chown root:staff $EXT 2> /dev/null || true
+fi
+
# libraries from the mozilla choosen take precedence
LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
More information about the pkg-java-commits
mailing list