[arch-commits] Commit in eclipse/repos (5 files)

[Eric Belanger]

    Date: Wednesday, August 6, 2008 @ 22:26:05
  Author: eric
Revision: 8138

Merged revisions 7363-8137 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/eclipse/trunk

........
  r8112 | paul | 2008-08-06 10:27:17 -0400 (Wed, 06 Aug 2008) | 2 lines
  
  upgpkg: eclipse 3.4-3
      move eclipse back to /usr/share
........
  r8137 | eric | 2008-08-06 22:25:53 -0400 (Wed, 06 Aug 2008) | 2 lines
  
  upgpkg: eclipse 3.4-3
      updated md5sums
........

Modified:
  eclipse/repos/extra-x86_64/	(properties)
  eclipse/repos/extra-x86_64/PKGBUILD
  eclipse/repos/extra-x86_64/eclipse.desktop
  eclipse/repos/extra-x86_64/eclipse.install
  eclipse/repos/extra-x86_64/eclipse.sh

-----------------+
 PKGBUILD        |   16 ++++++++--------
 eclipse.desktop |    4 ++--
 eclipse.install |    7 +------
 eclipse.sh      |    2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)


Property changes on: eclipse/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /eclipse/trunk:1-7362
   + /eclipse/trunk:1-8137

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-07 02:25:53 UTC (rev 8137)
+++ extra-x86_64/PKGBUILD	2008-08-07 02:26:05 UTC (rev 8138)
@@ -5,7 +5,7 @@
 
 pkgname=eclipse
 pkgver=3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64')
 url="http://eclipse.org"
@@ -13,16 +13,16 @@
 install=eclipse.install
 makedepends=(zip)
 provides=(eclipse)
-license="EPL/1.1"
+license=("EPL/1.1")
 md5sums=(4f7183395f61f70711a1f244faf5d763
-         f08e49e6dad13dda8b2e4036b2a3f28c
-         0bee44d3b8839d6b217b6a5efb27407f
+         78db5f9dfd844288afd49e0f357dd539
+         5a908647b7a9c9bb4467a499ec68b2e2
          ee66a334bc443fd23ad9bc080dc6ea69)
 if [ "$CARCH" = "x86_64" ]; then
     _arch=-x86_64
     md5sums=(6498216f6e6b50a203b5ab319af19dbe
-             f08e49e6dad13dda8b2e4036b2a3f28c
-             0bee44d3b8839d6b217b6a5efb27407f
+             78db5f9dfd844288afd49e0f357dd539
+             5a908647b7a9c9bb4467a499ec68b2e2
 	     ee66a334bc443fd23ad9bc080dc6ea69)
 fi
 source=(ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.4-200806172000/eclipse-SDK-$pkgver-linux-gtk$_arch.tar.gz
@@ -37,8 +37,8 @@
   patch -p0 < ../eclipse.ini.patch || return 1
 
   # install eclipse
-  mkdir $startdir/pkg/opt || return 1
-  mv $startdir/src/eclipse $startdir/pkg/opt || return 1
+  mkdir -p $startdir/pkg/usr/share || return 1
+  mv $startdir/src/eclipse $startdir/pkg/usr/share || return 1
 
   # install misc
   mkdir -p $startdir/pkg/etc/profile.d $startdir/pkg/usr/share/applications \

Modified: extra-x86_64/eclipse.desktop
===================================================================
--- extra-x86_64/eclipse.desktop	2008-08-07 02:25:53 UTC (rev 8137)
+++ extra-x86_64/eclipse.desktop	2008-08-07 02:26:05 UTC (rev 8138)
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Eclipse
 Comment=A Java Development Environment
-Icon=/opt/eclipse/icon.xpm
-Exec=/opt/eclipse/eclipse
+Icon=/usr/share/eclipse/icon.xpm
+Exec=/usr/share/eclipse/eclipse
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Development

Modified: extra-x86_64/eclipse.install
===================================================================
--- extra-x86_64/eclipse.install	2008-08-07 02:25:53 UTC (rev 8137)
+++ extra-x86_64/eclipse.install	2008-08-07 02:26:05 UTC (rev 8138)
@@ -10,14 +10,9 @@
 post_install() {
   # Prevent a bug, where eclipse hangs without this.
   # See http://aur.archlinux.org/packages.php?ID=12173
-  xulrunner --register-global
+  xulrunner --register-global >/dev/null 2>&1
 
   update-desktop-database >/dev/null 2>&1
-
-  echo <<EOF
-  To see how to use the included delta package for cross platform deployment,
-  follow http://mea-bloga.blogspot.com/2008/04/new-target-platform-preference.html
-EOF
 }
 
 # arg 1:  the new package version

Modified: extra-x86_64/eclipse.sh
===================================================================
--- extra-x86_64/eclipse.sh	2008-08-07 02:25:53 UTC (rev 8137)
+++ extra-x86_64/eclipse.sh	2008-08-07 02:26:05 UTC (rev 8138)
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-export ECLIPSE_HOME=/opt/eclipse
+export ECLIPSE_HOME=/usr/share/eclipse
 export PATH=$PATH:$ECLIPSE_HOME