Date: Tuesday, February 26, 2013 @ 06:29:04 Author: bgyorgy Revision: 84918
upgpkg: cinnamon 1.7.1-3 * Add a simpler but more complete python2 fix * Add python2-pyinotify as dependency for cinnamon-looking-glass Modified: cinnamon/trunk/PKGBUILD ----------+ PKGBUILD | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-02-26 05:26:02 UTC (rev 84917) +++ PKGBUILD 2013-02-26 05:29:04 UTC (rev 84918) @@ -6,15 +6,15 @@ pkgname=cinnamon pkgver=1.7.1 -pkgrel=2 +pkgrel=3 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=('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' 'clutter-gtk') +depends=('accountsservice' 'caribou' 'clutter-gtk' '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-pyinotify' 'python2-lxml') makedepends=('gnome-common' 'intltool') optdepends=('cinnamon-control-center: extended configurations for Cinnamon' 'cinnamon-screensaver: lock screen' @@ -58,16 +58,13 @@ package() { cd ${srcdir}/linuxmint-Cinnamon* make DESTDIR="${pkgdir}" install - + # Python2 fix - sed -i 's/bin\/python/bin\/python2/g' \ - "${pkgdir}/usr/bin/$pkgname-launcher" \ + sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \ "${pkgdir}/usr/bin/$pkgname-menu-editor" \ - "${pkgdir}/usr/bin/$pkgname-settings" \ "${pkgdir}/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py" - - sed -i 's/env python/env python2/g' \ - "${pkgdir}/usr/lib/$pkgname-settings/$pkgname-settings.py" + + find "${pkgdir}" -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' }