Version update: 17.10.2. Remove mutiny-fresh patch: layout no longer included.

3 files changed, 11 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 93c808a01dd1..ea3f9c1339f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue May  9 18:23:53 UTC 2017
+# Sat May 20 18:20:34 UTC 2017
 pkgbase = mate-tweak
 	pkgdesc = Tweak tool for MATE (fork of MintDesktop)
-	pkgver = 17.10.1
+	pkgver = 17.10.2
 	pkgrel = 1
 	url = https://bitbucket.org/ubuntu-mate/mate-tweak
 	arch = any
@@ -22,12 +22,10 @@ pkgbase = mate-tweak
 	optdepends = synapse: to enable launcher
 	optdepends = tilda: to enable pull-down terminal
 	optdepends = topmenu-gtk: for Mutiny panel layout
-	source = mate-tweak-17.10.1.tar.gz::https://bitbucket.org/ubuntu-mate/mate-tweak/get/17.10.1.tar.gz
-	source = https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-mate-settings_17.10.3.tar.xz
-	source = fix-mutiny-fresh.patch
-	sha256sums = 5d1004587116ebb7b5d59b20c466d217db973c84472dc561aae33c967d7ecb6a
-	sha256sums = f175a2dd16dbc946fc3b274819b638278e074dd031c33053c93573d5f2fb2c92
-	sha256sums = ac2ade84a532486c50245a176d370f0815330f13df07fd62e133afe0383db5fc
+	source = mate-tweak-17.10.2.tar.gz::https://bitbucket.org/ubuntu-mate/mate-tweak/get/17.10.2.tar.gz
+	source = https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-mate-settings_17.10.6.tar.xz
+	sha256sums = bdd676636039170b8ae13c4fa5065e48f95bcc433a8c6888bc928139141a1b03
+	sha256sums = c2ee4d26517672bb5c1628390fbb04998b6563777f0b4eea30b3b8abe0b7d606
 
 pkgname = mate-tweak
 
diff --git a/PKGBUILD b/PKGBUILD
index d6e7398019d2..ebfebf67604b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=mate-tweak
-pkgver=17.10.1
-_umsver=17.10.3
+pkgver=17.10.2
+_umsver=17.10.6
 pkgrel=1
 pkgdesc="Tweak tool for MATE (fork of MintDesktop)"
 arch=('any')
@@ -20,17 +20,13 @@ optdepends=('mate-applet-dock: for Mutiny panel layout'
             'tilda: to enable pull-down terminal'
             'topmenu-gtk: for Mutiny panel layout')
 source=("$pkgname-$pkgver.tar.gz::https://bitbucket.org/ubuntu-mate/$pkgname/get/$pkgver.tar.gz"
-        "https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-mate-settings_$_umsver.tar.xz"
-        "fix-mutiny-fresh.patch")
-sha256sums=('5d1004587116ebb7b5d59b20c466d217db973c84472dc561aae33c967d7ecb6a'
-            'f175a2dd16dbc946fc3b274819b638278e074dd031c33053c93573d5f2fb2c92'
-            'ac2ade84a532486c50245a176d370f0815330f13df07fd62e133afe0383db5fc')
+        "https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-mate-settings_$_umsver.tar.xz")
+sha256sums=('bdd676636039170b8ae13c4fa5065e48f95bcc433a8c6888bc928139141a1b03'
+            'c2ee4d26517672bb5c1628390fbb04998b6563777f0b4eea30b3b8abe0b7d606')
 
 prepare() {
   cd ubuntu-mate-$pkgname-*
   sed -i 's|/usr/lib/mate-applets/topmenu-mate-panel-applet|/usr/lib/topmenu-gtk/topmenu-mate-panel-applet|' mate-tweak
-  cd ../ubuntu-mate-settings
-  patch -Np1 -i ../fix-mutiny-fresh.patch
 }
 
 package() {
diff --git a/fix-mutiny-fresh.patch b/fix-mutiny-fresh.patch
deleted file mode 100644
index ebc0d0a303e3..000000000000
--- a/fix-mutiny-fresh.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur ubuntu-mate-settings-16.04.1.orig/usr/share/mate-panel/layouts/mutiny-fresh.panel ubuntu-mate-settings-16.04.1/usr/share/mate-panel/layouts/mutiny-fresh.panel
---- ubuntu-mate-settings-16.04.1.orig/usr/share/mate-panel/layouts/mutiny-fresh.panel	2016-02-21 19:16:14.000000000 +0100
-+++ ubuntu-mate-settings-16.04.1/usr/share/mate-panel/layouts/mutiny-fresh.panel	2016-02-26 04:51:48.024833424 +0100
-@@ -16,6 +16,14 @@
- screen=0
- size=24
- 
-+[objects/topmenu]
-+applet-iid='TopMenuMatePanelAppletFactory::TopMenuMatePanelApplet'
-+locked=true
-+toplevel-id='top'
-+position=48
-+object-type='applet'
-+panel-right-stick=false
-+
- [objects/notification-area]
- applet-iid='NotificationAreaAppletFactory::NotificationArea'
- locked=true