Fetch the icon from a different location

3 files changed, 15 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c25e46922b49..06f2e8ca9406 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by makepkg 4.2.1
-# Tue Jun 30 14:54:21 UTC 2015
+# Tue Jun 30 22:42:58 UTC 2015
 pkgbase = android-sdk
 	pkgdesc = Google Android SDK
 	pkgver = 24.3.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://developer.android.com/sdk/
 	install = android-sdk.install
 	arch = x86_64
@@ -12,14 +12,14 @@ pkgbase = android-sdk
 	optdepends = android-udev: udev rules for Android devices
 	optdepends = android-sdk-platform-tools: adb, aapt, aidl, dexdump and dx
 	source = https://dl-ssl.google.com/android/repository/tools_r24.3.3-linux.zip
-	source = http://tools.android.com/recent/miscellaneousimprovements-1/android_icon_128.png
+	source = https://developer.android.com/assets/images/android_logo.png
 	source = android-sdk.desktop
 	source = android-sdk.sh
 	source = android-sdk.csh
 	source = android-sdk.conf
 	source = license.html
 	sha1sums = c2c6f6236cbee34c80ec6b5f9f6b7bf0bc5919cb
-	sha1sums = 6497b745f05fc412490f74c66e10b9c5f15e6330
+	sha1sums = b8726c63294a23e5fea066a36061164e583b5732
 	sha1sums = e834f53e13d5926ec7be3fd775fa80aa6f328eb6
 	sha1sums = 78f8574e651c9bf8b7515ecb30c7ef93edbc4a96
 	sha1sums = 08c85aab7523e22b298891c7047bc0e7adbf3437
@@ -40,8 +40,8 @@ pkgbase = android-sdk
 	depends_i686 = openal
 	depends_i686 = libstdc++5
 	depends_i686 = libxv
-	depends_i686 = ncurses
 	depends_i686 = sdl
+	depends_i686 = ncurses
 	depends_i686 = swt
 	depends_i686 = zlib
 
diff --git a/PKGBUILD b/PKGBUILD
index 1cde6a2ce3b7..747853273c8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,27 +4,28 @@
 
 pkgname=android-sdk
 pkgver=24.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Google Android SDK'
 arch=('x86_64' 'i686')
 url='http://developer.android.com/sdk/'
 license=('custom')
-depends_x86_64=('java-environment' 'lib32-alsa-lib' 'lib32-openal' 'lib32-libstdc++5'
-                'lib32-libxv' 'lib32-mesa' 'lib32-ncurses' 'lib32-sdl' 'lib32-zlib' 'swt')
-depends_i686=('java-environment' 'alsa-lib' 'openal' 'libstdc++5' 'libxv'
-              'ncurses' 'sdl' 'swt' 'zlib')
+depends_x86_64=('java-environment' 'lib32-alsa-lib' 'lib32-openal'
+  'lib32-libstdc++5' 'lib32-libxv' 'lib32-mesa' 'lib32-ncurses' 'lib32-sdl'
+  'lib32-zlib' 'swt')
+depends_i686=('java-environment' 'alsa-lib' 'openal' 'libstdc++5' 'libxv' 'sdl'
+              'ncurses' 'swt' 'zlib')
 install="$pkgname.install"
 optdepends=('android-udev: udev rules for Android devices'
             'android-sdk-platform-tools: adb, aapt, aidl, dexdump and dx')
-source=("https://dl-ssl.google.com/android/repository/tools_r${pkgver%.0}-linux.zip"
-        'http://tools.android.com/recent/miscellaneousimprovements-1/android_icon_128.png'
+source=("https://dl-ssl.google.com/android/repository/tools_r${pkgver}-linux.zip"
+        'https://developer.android.com/assets/images/android_logo.png'
         "$pkgname.desktop"
         "$pkgname.sh"
         "$pkgname.csh"
         "$pkgname.conf"
         'license.html')
 sha1sums=('c2c6f6236cbee34c80ec6b5f9f6b7bf0bc5919cb'
-          '6497b745f05fc412490f74c66e10b9c5f15e6330'
+          'b8726c63294a23e5fea066a36061164e583b5732'
           'e834f53e13d5926ec7be3fd775fa80aa6f328eb6'
           '78f8574e651c9bf8b7515ecb30c7ef93edbc4a96'
           '08c85aab7523e22b298891c7047bc0e7adbf3437'
@@ -35,7 +36,7 @@ package() {
   install -Dm755 "$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh"
   install -Dm755 "$pkgname.csh" "$pkgdir/etc/profile.d/$pkgname.csh"
   install -Dm644 "$pkgname.conf" "$pkgdir/etc/ld.so.conf.d/$pkgname.conf"
-  install -Dm644 android_icon_128.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 android_logo.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm644 "$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
   install -Dm644 license.html \
diff --git a/android_icon_128.png b/android_icon_128.png
deleted file mode 100644
index bb347372517b..000000000000
--- a/android_icon_128.png
+++ /dev/null