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

[Paul Mattal]

    Date: Friday, May 1, 2009 @ 10:25:40
  Author: paul
Revision: 37418

Merged revisions 30766,37096,37417 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/eclipse/trunk

........
  r30766 | eric | 2009-03-21 17:40:51 -0400 (Sat, 21 Mar 2009) | 1 line
  
  Fixed missing icon in menu (close FS#11436)
........
  r37096 | paul | 2009-04-30 17:35:30 -0400 (Thu, 30 Apr 2009) | 2 lines
  
  upgpkg: eclipse 3.4.2-1
      update to 3.4.2, add desktop-file-utils dependency (fixes #14490)
........
  r37417 | paul | 2009-05-01 10:24:59 -0400 (Fri, 01 May 2009) | 2 lines
  
  upgpkg: eclipse 3.4.2-1
      update to 3.4.2
........

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

-----------------+
 PKGBUILD        |   21 ++++++++++++++-------
 eclipse.desktop |    2 +-
 eclipse.install |   19 +++----------------
 3 files changed, 18 insertions(+), 24 deletions(-)


Property changes on: eclipse/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /eclipse/trunk:1-18334
   + /eclipse/trunk:1-37417

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-01 14:24:59 UTC (rev 37417)
+++ extra-x86_64/PKGBUILD	2009-05-01 14:25:40 UTC (rev 37418)
@@ -4,28 +4,28 @@
 # Maintainer: Paul Mattal <paul at archlinux.org>
 
 pkgname=eclipse
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64')
 url="http://eclipse.org"
-depends=('java-environment' gtk2 unzip xulrunner)
+depends=('java-environment' gtk2 unzip xulrunner 'desktop-file-utils')
 install=eclipse.install
 makedepends=(zip)
 license=("EPL/1.1")
 if [ "$CARCH" = "x86_64" ]; then
     _arch=-x86_64
-md5sums=('e068a144117bf83a3a4ef62022f47af6'
+md5sums=('a9b5451901acee28f935852b1cbc9278'
          '78db5f9dfd844288afd49e0f357dd539'
-         '5a908647b7a9c9bb4467a499ec68b2e2'
+         'cbf880d22bfd4a34c5f6433007ed90f2'
          'ee66a334bc443fd23ad9bc080dc6ea69')
 else
-md5sums=('bb8aea8f12c8540ae52f35226da9f363'
+md5sums=('a131aa4fc6c858be4fc17f6d4bdb7089'
          '78db5f9dfd844288afd49e0f357dd539'
-         '5a908647b7a9c9bb4467a499ec68b2e2'
+         'cbf880d22bfd4a34c5f6433007ed90f2'
          'ee66a334bc443fd23ad9bc080dc6ea69')
 fi
-source=(ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.4.1-200809111700/eclipse-SDK-$pkgver-linux-gtk$_arch.tar.gz
+source=(ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.4.2-200902111700/eclipse-SDK-$pkgver-linux-gtk$_arch.tar.gz
             eclipse.sh
             eclipse.desktop
 	    eclipse.ini.patch)
@@ -42,9 +42,16 @@
 
   # install misc
   mkdir -p $startdir/pkg/etc/profile.d $startdir/pkg/usr/share/applications \
+    $startdir/pkg/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps \
   	|| return 1
   install -m755 $startdir/src/eclipse.sh \
   	$startdir/pkg/etc/profile.d/eclipse.sh || return 1
   install -m644 $startdir/src/eclipse.desktop \
   	$startdir/pkg/usr/share/applications/eclipse.desktop || return 1
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_3.4.1.v200809111700/eclipse.png \
+    $startdir/pkg/usr/share/icons/hicolor/16x16/apps/eclipse.png || return 1
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_3.4.1.v200809111700/eclipse32.png \
+    $startdir/pkg/usr/share/icons/hicolor/32x32/apps/eclipse.png || return 1
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_3.4.1.v200809111700/eclipse48.png \
+    $startdir/pkg/usr/share/icons/hicolor/48x48/apps/eclipse.png || return 1
 }

Modified: extra-x86_64/eclipse.desktop
===================================================================
--- extra-x86_64/eclipse.desktop	2009-05-01 14:24:59 UTC (rev 37417)
+++ extra-x86_64/eclipse.desktop	2009-05-01 14:25:40 UTC (rev 37418)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Eclipse
 Comment=A Java Development Environment
-Icon=/usr/share/eclipse/icon.xpm
+Icon=eclipse
 Exec=/usr/share/eclipse/eclipse
 Terminal=false
 Type=Application

Modified: extra-x86_64/eclipse.install
===================================================================
--- extra-x86_64/eclipse.install	2009-05-01 14:24:59 UTC (rev 37417)
+++ extra-x86_64/eclipse.install	2009-05-01 14:25:40 UTC (rev 37418)
@@ -2,36 +2,23 @@
 # remove any functions you don't need (and this header).
 
 # arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
 post_install() {
   # Prevent a bug, where eclipse hangs without this.
   # See http://aur.archlinux.org/packages.php?ID=12173
   xulrunner --register-global >/dev/null 2>&1
 
   update-desktop-database >/dev/null 2>&1
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 # arg 1:  the new package version
 # arg 2:  the old package version
-pre_upgrade() {
+post_upgrade() {
   post_install $1
 }
 
 # arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
 post_remove() {
   update-desktop-database >/dev/null 2>&1
-  /bin/true
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-$op $*