Index: PKGBUILD
===================================================================
--- PKGBUILD	(revision 83874)
+++ PKGBUILD	(working copy)
@@ -5,29 +5,33 @@
 
 pkgname=cinnamon
 pkgver=1.6.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
-depends=('caribou' 'gjs' 'gnome-bluetooth' 'gnome-control-center' 'gnome-panel' 'gnome-session'
-         'gnome-settings-daemon' 'gnome-themes-standard' 'gstreamer0.10' 'libgnomekbd' 'muffin'
-         'notification-daemon' 'python2-gconf' 'python2-imaging' 'python2-lxml' 'python2-dbus' 'gksu')
+depends=('accountsservice' 'caribou' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme'
+         'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard'
+         'gstreamer0.10' 'libgnomekbd' 'networkmanager' 'muffin' 'python2-dbus'
+         'python2-gconf' 'python2-imaging' 'python2-lxml')
 makedepends=('gnome-common' 'intltool')
-optdepends=('nautilus: the official Gnome file manager')
+optdepends=('gnome-control-center: open settings from various applets'
+            'gnome-screensaver: lock screen'
+            'nautilus: open removable drives, trash and other places')
 options=('!libtool' '!emptydirs')
 install=${pkgname}.install
 source=("$pkgname.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
         "cinnamon-screensaver.desktop"
         "cinnamon2d-screensaver.desktop"
-        "fix-cursor-change.patch"
         "gnome-autogen.sh")
+md5sums=('ea73c6367d43d82c61f977477bf0c08c'
+         'd55c079cdc8bec606f510f87b2a6f776'
+         '5c6af851ab1cf7e9219f11d86353196a'
+         'a925691c9b57a6a884dcf07da057fd1f')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
 
-  patch -Np1 -i ${srcdir}/fix-cursor-change.patch
-
   cp ${srcdir}/gnome-autogen.sh .
   sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am
   sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh
@@ -65,8 +69,3 @@
   cp $srcdir/cinnamon*-screensaver.desktop $pkgdir/etc/xdg/autostart
 }
 
-md5sums=('ea73c6367d43d82c61f977477bf0c08c'
-         'd55c079cdc8bec606f510f87b2a6f776'
-         '5c6af851ab1cf7e9219f11d86353196a'
-         '8d7a93a1eb0f1d44e4869abd342ed22a'
-         'a925691c9b57a6a884dcf07da057fd1f')
Index: cinnamon.install
===================================================================
--- cinnamon.install	(revision 83874)
+++ cinnamon.install	(working copy)
@@ -1,19 +1,19 @@
 post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
-  
-  if [[ ! -f '/usr/lib/libgnome-desktop-3.so.2' ]];then
-
-    if [[ $(uname -m) == 'i686' ]];then
-    	ln -s /usr/lib/libgnome-desktop-3.so /usr/lib/libgnome-desktop-3.so.2
-    fi
-
-  fi
 }
 
 pre_upgrade() {
   if [ -f /usr/share/gconf/schemas/cinnamon.schemas ]; then
     gconfpkg --uninstall cinnamon
   fi
+
+  if [ "$(vercmp 1.6.7-6 "$2")" -eq 1 ]; then
+    if [[ -h '/usr/lib/libgnome-desktop-3.so.2' ]]; then
+      if [[ $(uname -m) == 'i686' ]]; then
+        unlink /usr/lib/libgnome-desktop-3.so.2
+      fi
+    fi
+  fi
 }
 
 post_upgrade() {
@@ -25,13 +25,5 @@
 }
 
 post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-
-  if [[ ! -f '/usr/lib/libgnome-desktop-3.so.2' ]];then
-
-    if [[ $(uname -m) == 'i686' ]];then
-    	unlink /usr/lib/libgnome-desktop-3.so.2
-    fi
-
-  fi
+  post_install
 }
Index: fix-cursor-change.patch
===================================================================
--- fix-cursor-change.patch	(revision 83874)
+++ fix-cursor-change.patch	(working copy)
@@ -1,58 +0,0 @@
---- cinnamon-original/files/usr/lib/cinnamon-settings/cinnamon-settings.py	2012-11-14 15:45:14.000000000 +0100
-+++ cinnamon-new/files/usr/lib/cinnamon-settings/cinnamon-settings.py	2013-01-21 12:49:11.332556000 +0100
- try:
-     import os
-@@ -915,7 +915,8 @@
-         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
-         res = []
-         for i in valid:
--            res.append((i, i))
-+            if i != 'default':
-+                res.append((i, i))
-         return res
-         
-     def _load_keybinding_themes(self):
-@@ -933,7 +934,8 @@
-         valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
-         res = []
-         for i in valid:
--            res.append((i, i))
-+            if i != 'default':
-+                res.append((i, i))
-         return res
-         
-     def _load_window_themes(self):
-@@ -1638,7 +1640,7 @@
-     def onCategoryChanged(self, tree):
-         self.kb_store.clear()
-         if tree.get_selection() is not None:
--            categories, iter = tree.get_selection().get_selected()
-+            categories, iter = tree.get_selection().get_selected() 
-             if iter:
-                 category = categories[iter][1]
-                 if category.int_name is not "custom":
-@@ -2005,7 +2007,7 @@
- 
-     def on_my_setting_changed(self, settings, key):
-         self.content_widget.set_text(self.settings.get_string(self.key))
--
-+    
-     def on_my_value_changed(self, event, widget):        
-         self.settings.set_string(self.key, self.content_widget.get_text())
- 
-@@ -2260,8 +2262,14 @@
-     def on_my_value_changed(self, widget):
-         tree_iter = widget.get_active_iter()
-         if tree_iter != None:            
--            value = self.model[tree_iter][0]            
-+            value = self.model[tree_iter][0]          
-             self.settings.set_string(self.key, value)
-+            if self.key == 'cursor-theme':
-+                if os.path.exists("/usr/share/icons/%s" % value):
-+                    commands.getoutput('gksudo "ln -snf /usr/share/icons/%s /usr/share/icons/default"' % value.strip())
-+                elif os.path.exists("%s/.icons/%s" % (os.path.join(os.path.expanduser("~")), value)):
-+                    commands.getoutput('gksudo "ln -snf %s/.icons/%s /usr/share/icons/default"' % (os.path.join(os.path.expanduser("~")), value))
-+                   
- 
-     def on_dependency_setting_changed(self, settings, dep_key):
-         if not self.dependency_invert: