summaryrefslogtreecommitdiff
path: root/community/cinnamon
diff options
context:
space:
mode:
Diffstat (limited to 'community/cinnamon')
-rw-r--r--community/cinnamon/PKGBUILD23
-rw-r--r--community/cinnamon/cinnamon-screensaver.desktop15
-rw-r--r--community/cinnamon/cinnamon2d-screensaver.desktop15
3 files changed, 8 insertions, 45 deletions
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 20e4f3d2f..4172caf6b 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 84329 2013-02-16 17:25:27Z bgyorgy $
+# $Id: PKGBUILD 84799 2013-02-24 18:38:31Z faidoc $
+# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
# Contributor: M0Rf30
# Contributor: unifiedlinux
# Contributor: CReimer
pkgname=cinnamon
-pkgver=1.6.7
-pkgrel=7
+pkgver=1.7.1
+pkgrel=1
pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('i686' 'x86_64')
url="http://cinnamon.linuxmint.com/"
@@ -13,23 +14,19 @@ license=('GPL2')
depends=('accountsservice' 'caribou' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme'
'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard'
'gstreamer0.10' 'networkmanager' 'muffin' 'python2-dbus'
- 'python2-gconf' 'python2-imaging' 'python2-lxml')
+ 'python2-gconf' 'python2-imaging' 'python2-lxml' 'cinnamon-screensaver')
makedepends=('gnome-common' 'intltool')
-optdepends=('gnome-control-center: open settings from various applets'
- 'gnome-screensaver: lock screen'
+optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
'gucharmap: show character table from Keyboard applet'
'libgnomekbd: show keyboard layout from Keyboard applet'
+ 'nemo: the official Cinnamon file manager (forked from Nautilus)'
'nautilus: the official Gnome file manager')
options=('!libtool' '!emptydirs')
install=${pkgname}.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
- "cinnamon-screensaver.desktop"
- "cinnamon2d-screensaver.desktop"
"gnome-autogen.sh"
"keyboard_applet.patch")
-md5sums=('ea73c6367d43d82c61f977477bf0c08c'
- 'd55c079cdc8bec606f510f87b2a6f776'
- '5c6af851ab1cf7e9219f11d86353196a'
+md5sums=('13daa8fde1480bbee25eddc2e2630319'
'a925691c9b57a6a884dcf07da057fd1f'
'2b1ece84416c3e4de030be15f1774d82')
@@ -70,10 +67,6 @@ package() {
sed -i 's/env python/env python2/g' \
"${pkgdir}/usr/lib/$pkgname-settings/$pkgname-settings.py"
-
- # Screensaver gnome 3.6 fix
- mkdir -p $pkgdir/etc/xdg/autostart
- cp $srcdir/cinnamon*-screensaver.desktop $pkgdir/etc/xdg/autostart
}
diff --git a/community/cinnamon/cinnamon-screensaver.desktop b/community/cinnamon/cinnamon-screensaver.desktop
deleted file mode 100644
index ddc968691..000000000
--- a/community/cinnamon/cinnamon-screensaver.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Cinnamon Screensaver
-Comment=Launch screensaver and locker program
-Icon=preferences-desktop-screensaver
-Exec=gnome-screensaver
-OnlyShowIn=GNOME;
-AutostartCondition=GNOME3 if-session cinnamon
-NoDisplay=true
-X-GNOME-Autostart-Phase=Application
-X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-screensaver
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.6.0
diff --git a/community/cinnamon/cinnamon2d-screensaver.desktop b/community/cinnamon/cinnamon2d-screensaver.desktop
deleted file mode 100644
index aed9557bf..000000000
--- a/community/cinnamon/cinnamon2d-screensaver.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Cinnamon2d Screensaver
-Comment=Launch screensaver and locker program
-Icon=preferences-desktop-screensaver
-Exec=gnome-screensaver
-OnlyShowIn=GNOME;
-AutostartCondition=GNOME3 if-session cinnamon2d
-NoDisplay=true
-X-GNOME-Autostart-Phase=Application
-X-GNOME-Autostart-Notify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-screensaver
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.6.0