update to version 16.10.16.10.20161024

3 files changed, 44 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f42cba93c0c..0fa499b8f251 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,8 @@
-# Generated by mksrcinfo v8
-# Sat Apr 23 07:58:56 UTC 2016
 pkgbase = ubuntu-themes
 	pkgdesc = Ubuntu monochrome icon theme, Ambiance and Radiance themes, and Ubuntu artwork
-	pkgver = 14.04.16.04.20160415
+	pkgver = 16.10.16.10.20161024
 	pkgrel = 1
 	url = https://launchpad.net/ubuntu-themes
-	install = ubuntu-themes.install
 	arch = any
 	groups = unity-extra
 	license = CCPL
@@ -20,8 +17,8 @@ pkgbase = ubuntu-themes
 	provides = ubuntu-mono
 	conflicts = light-themes
 	conflicts = ubuntu-mono
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-themes_14.04+16.04.20160415.orig.tar.gz
-	sha256sums = f5cbcfb3728c27295c981ef34f92dae9b48f4a8d114f63ff5bde5846b46cd383
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-themes_16.10+16.10.20161024.orig.tar.gz
+	sha512sums = 3cafb43220885257673f0a629b122511fef2954e45ab7426a2425a543f7602ab85f74509cf1fdf2c586ce968bc73669e46dfdf91bad09fe0dff1c2dad4a58f27
 
 pkgname = ubuntu-themes
 
diff --git a/PKGBUILD b/PKGBUILD
index 219721bf4b82..ee50c8e701a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,56 @@
-# Maintainer: yaroslav <proninyaroslav@mail.ru>
-# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Maintainer: Michael Healy <horsemanoffaith@gmail.com>
 
 # vercheck-pkgbuild: auto
-# vercheck-ubuntu: name=${pkgname}, repo=vivid
+# vercheck-ubuntu: name=${pkgname}, repo=yakkety
 
 pkgname=ubuntu-themes
-_actual_ver=14.04
-_extra_ver=+16.04.20160415
+_actual_ver=16.10
+_extra_ver=+16.10.20161024
+_ubuntu_rel=0ubuntu1
 pkgver=${_actual_ver}${_extra_ver/\+/.}
 pkgrel=1
-pkgdesc='Ubuntu monochrome icon theme, Ambiance and Radiance themes, and Ubuntu artwork'
-arch=('any')
+pkgdesc="Ubuntu monochrome icon theme, Ambiance and Radiance themes, and Ubuntu artwork"
+arch=(any)
 url="https://launchpad.net/ubuntu-themes"
-license=('CCPL')
-groups=('unity-extra')
-depends=('humanity-icon-theme' 'adwaita-icon-theme' 'hicolor-icon-theme' 'gtk-engine-murrine')
-makedepends=('python2' 'imagemagick' 'icon-naming-utils')
-provides=('light-themes' 'ubuntu-mono')
-conflicts=('light-themes' 'ubuntu-mono')
-install=${pkgname}.install
+license=(CCPL)
+groups=(unity-extra)
+depends=(humanity-icon-theme adwaita-icon-theme hicolor-icon-theme
+         gtk-engine-murrine)
+makedepends=(python2 imagemagick icon-naming-utils)
+provides=(light-themes ubuntu-mono)
+conflicts=(light-themes ubuntu-mono)
 source=("https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${_actual_ver}${_extra_ver}.orig.tar.gz")
-sha256sums=('f5cbcfb3728c27295c981ef34f92dae9b48f4a8d114f63ff5bde5846b46cd383')
+
+sha512sums=('3cafb43220885257673f0a629b122511fef2954e45ab7426a2425a543f7602ab85f74509cf1fdf2c586ce968bc73669e46dfdf91bad09fe0dff1c2dad4a58f27')
 
 build() {
-    # Python 2 fix
-    sed -i 's|^\(#!.*python$\)|\12|g' scavenge.py
+  #cd "${pkgname}-${_actual_ver}${_extra_ver}"
+
+  # Python 2 fix
+  sed -i 's|^\(#!.*python$\)|\12|g' scavenge.py
 
-    make
+  make
 }
 
 package() {
-    # Install themes
-    install -dm755   "${pkgdir}/usr/share/themes/"
-    cp -av Ambiance/ "${pkgdir}/usr/share/themes/"
-    cp -av Radiance/ "${pkgdir}/usr/share/themes/"
-
-    # Install icons
-    install -dm755            "${pkgdir}/usr/share/icons/"
-    cp -av ubuntu-mono-dark/  "${pkgdir}/usr/share/icons/"
-    cp -av ubuntu-mono-light/ "${pkgdir}/usr/share/icons/"
-    cp -av LoginIcons/        "${pkgdir}/usr/share/icons/"
-    cp -av suru-icons/        "${pkgdir}/usr/share/icons/"
-    cp -av ubuntu-mobile/     "${pkgdir}/usr/share/icons/"
-
-    mv "${pkgdir}"/usr/share/icons/{suru-icons,suru}/
-
-    install -Dm644 distributor-logo.png \
-            "${pkgdir}/usr/share/icons/hicolor/48x48/apps/distributor-logo.png"
+  #cd "${pkgname}-${_actual_ver}${_extra_ver}"
+
+  # Install themes
+  install -dm755   "${pkgdir}/usr/share/themes/"
+  cp -av Ambiance/ "${pkgdir}/usr/share/themes/"
+  cp -av Radiance/ "${pkgdir}/usr/share/themes/"
+
+  # Install icons
+  install -dm755            "${pkgdir}/usr/share/icons/"
+  cp -av ubuntu-mono-dark/  "${pkgdir}/usr/share/icons/"
+  cp -av ubuntu-mono-light/ "${pkgdir}/usr/share/icons/"
+  cp -av LoginIcons/        "${pkgdir}/usr/share/icons/"
+  cp -av suru-icons/        "${pkgdir}/usr/share/icons/"
+  cp -av ubuntu-mobile/     "${pkgdir}/usr/share/icons/"
+
+  mv "${pkgdir}"/usr/share/icons/{suru-icons,suru}/
+
+  install -Dm644 distributor-logo.png \
+    "${pkgdir}/usr/share/icons/hicolor/48x48/apps/distributor-logo.png"
 }
diff --git a/ubuntu-themes.install b/ubuntu-themes.install
deleted file mode 100644
index 13f15bf8ea30..000000000000
--- a/ubuntu-themes.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  if [ -x $(which gtk-update-icon-cache) ]; then
-    gtk-update-icon-cache -q -t -f usr/share/icons/LoginIcons/
-    gtk-update-icon-cache -q -t -f usr/share/icons/ubuntu-mono-dark/
-    gtk-update-icon-cache -q -t -f usr/share/icons/ubuntu-mono-light/
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}