[arch-commits] Commit in cinnamon-screensaver/trunk (4 files)
Balló György
bgyorgy at nymeria.archlinux.org
Wed Feb 27 21:01:39 UTC 2013
Date: Wednesday, February 27, 2013 @ 22:01:39
Author: bgyorgy
Revision: 85233
upgpkg: cinnamon-screensaver 1.7.1-3
* Remove conflicting files with gnome-screensaver
* Replace autostart file to start only in Cinnamon sessions
* Remove unneeded .install file
* Cleanup dependencies
Added:
cinnamon-screensaver/trunk/cinnamon-screensaver.desktop
cinnamon-screensaver/trunk/cinnamon2d-screensaver.desktop
Modified:
cinnamon-screensaver/trunk/PKGBUILD
Deleted:
cinnamon-screensaver/trunk/cinnamon-screensaver.install
--------------------------------+
PKGBUILD | 19 ++++++++++++++-----
cinnamon-screensaver.desktop | 11 +++++++++++
cinnamon-screensaver.install | 7 -------
cinnamon2d-screensaver.desktop | 11 +++++++++++
4 files changed, 36 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-02-27 20:29:32 UTC (rev 85232)
+++ PKGBUILD 2013-02-27 21:01:39 UTC (rev 85233)
@@ -5,23 +5,25 @@
pkgname=cinnamon-screensaver
pkgver=1.7.1
-pkgrel=2
+pkgrel=3
pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
arch=('i686' 'x86_64')
license=('GPL')
url="https://github.com/linuxmint/cinnamon-screensaver"
backup=(etc/pam.d/cinnamon-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'systemd')
-makedepends=('pkgconfig' 'intltool' 'libxss' 'gnome-common')
-conflicts=('gnome-screensaver')
+depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
+makedepends=('intltool' 'gnome-common')
options=(!emptydirs)
-install=cinnamon-screensaver.install
source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
+ cinnamon-screensaver.desktop
+ cinnamon2d-screensaver.desktop
cinnamon-screensaver.pam
gnome-autogen.sh
configure.patch)
sha256sums=('055abbc24305dad5efa609b354e01fdc367792ccac5383df4b28090ab0bf64e1'
+ '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa'
+ '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a'
'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb'
'827276b01e658afb8045fb0dcbebb54f679ef47dac482f4399e1839369277ccc'
'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a')
@@ -48,4 +50,11 @@
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver"
+
+ # Remove conflicts with gnome-screensaver
+ rm "$pkgdir"/usr/bin/gnome-screensaver{,-command}
+
+ # Autostart only in Cinnamon
+ install -m644 "$srcdir/cinnamon-screensaver.desktop" "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop"
+ install -m644 "$srcdir/cinnamon2d-screensaver.desktop" "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
}
Added: cinnamon-screensaver.desktop
===================================================================
--- cinnamon-screensaver.desktop (rev 0)
+++ cinnamon-screensaver.desktop 2013-02-27 21:01:39 UTC (rev 85233)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Cinnamon Screensaver
+Comment=Launch screensaver and locker program
+Icon=preferences-desktop-screensaver
+Exec=cinnamon-screensaver
+OnlyShowIn=GNOME;
+AutostartCondition=GNOME3 if-session cinnamon
+NoDisplay=true
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
Deleted: cinnamon-screensaver.install
===================================================================
--- cinnamon-screensaver.install 2013-02-27 20:29:32 UTC (rev 85232)
+++ cinnamon-screensaver.install 2013-02-27 21:01:39 UTC (rev 85233)
@@ -1,7 +0,0 @@
-pkgname=cinnamon-screensaver
-
-pre_upgrade() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- gconfpkg --uninstall ${pkgname}
- fi
-}
Added: cinnamon2d-screensaver.desktop
===================================================================
--- cinnamon2d-screensaver.desktop (rev 0)
+++ cinnamon2d-screensaver.desktop 2013-02-27 21:01:39 UTC (rev 85233)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Cinnamon Screensaver
+Comment=Launch screensaver and locker program
+Icon=preferences-desktop-screensaver
+Exec=cinnamon-screensaver
+OnlyShowIn=GNOME;
+AutostartCondition=GNOME3 if-session cinnamon2d
+NoDisplay=true
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
More information about the arch-commits
mailing list