[arch-commits] Commit in cinnamon-screensaver/trunk (3 files)

[Balló György]

    Date: Wednesday, August 14, 2013 @ 16:18:27
  Author: bgyorgy
Revision: 95578

Modify the original autostart desktop file rather than shipping our own

Modified:
  cinnamon-screensaver/trunk/PKGBUILD
Deleted:
  cinnamon-screensaver/trunk/cinnamon-screensaver.desktop
  cinnamon-screensaver/trunk/cinnamon2d-screensaver.desktop

--------------------------------+
 PKGBUILD                       |   14 ++++++++------
 cinnamon-screensaver.desktop   |   11 -----------
 cinnamon2d-screensaver.desktop |   11 -----------
 3 files changed, 8 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-14 14:17:35 UTC (rev 95577)
+++ PKGBUILD	2013-08-14 14:18:27 UTC (rev 95578)
@@ -15,13 +15,9 @@
 makedepends=('intltool' 'gnome-common')
 options=(!emptydirs)
 source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
-       cinnamon-screensaver.desktop
-       cinnamon2d-screensaver.desktop
        cinnamon-screensaver.pam
        fix-dbus-compatibility.patch)
 sha256sums=('e85722d5af2ecbed98f50909285b335d7635214bf8cada49964f60bb5d1339c1'
-            '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa'
-            '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a'
             'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
             'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6')
 
@@ -48,6 +44,12 @@
   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"
+  cp "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" \
+    "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
+  sed -i 's/^OnlyShowIn=.*/OnlyShowIn=GNOME;/' \
+    "$pkgdir"/etc/xdg/autostart/cinnamon{,2d}-screensaver.desktop
+  echo 'AutostartCondition=GNOME3 if-session cinnamon' \
+    >> "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop"
+  echo 'AutostartCondition=GNOME3 if-session cinnamon2d' \
+    >> "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
 }

Deleted: cinnamon-screensaver.desktop
===================================================================
--- cinnamon-screensaver.desktop	2013-08-14 14:17:35 UTC (rev 95577)
+++ cinnamon-screensaver.desktop	2013-08-14 14:18:27 UTC (rev 95578)
@@ -1,11 +0,0 @@
-[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: cinnamon2d-screensaver.desktop
===================================================================
--- cinnamon2d-screensaver.desktop	2013-08-14 14:17:35 UTC (rev 95577)
+++ cinnamon2d-screensaver.desktop	2013-08-14 14:18:27 UTC (rev 95578)
@@ -1,11 +0,0 @@
-[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