Use make_session_desktop instead of a local file

Package-Manager: portage-2.1.2-r4

diff --git a/rox-base/rox-session/ChangeLog b/rox-base/rox-session/ChangeLog
index 9589fb1fe874b7918a94fdf76079ab3012002de6..302168d58ac391b30b879cdee3ecd1b7a6969241 100644 (file)
--- a/rox-base/rox-session/ChangeLog
+++ b/rox-base/rox-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/rox-session
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.18 2007/01/30 17:32:36 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.19 2007/01/30 17:53:05 lack Exp $
+
+  30 Jan 2007; Jim Ramsay <lack@gentoo.org> -files/rox.desktop,
+  rox-session-0.29.ebuild:
+  Use make_session_desktop instead of a local file
 
   30 Jan 2007; Jim Ramsay <lack@gentoo.org> rox-session-0.27-r1.ebuild:
   Bug 164537: 0.27 is not compatible with >=dbus-python-0.80. 0.29 is, so just

diff --git a/rox-base/rox-session/Manifest b/rox-base/rox-session/Manifest
index 8d0066869111dc672f1bc6e855c5645ff32e366f..b2ab15fb6df5725936cb3f67ed72b330ce879c80 100644 (file)
--- a/rox-base/rox-session/Manifest
+++ b/rox-base/rox-session/Manifest
@@ -2,10 +2,6 @@ AUX rox-start 1116 RMD160 c3fdf89c98fa8818febcc94af5c11af2501d2008 SHA1 0d440126
 MD5 fbbaab840519a479100468ecbf57479e files/rox-start 1116
 RMD160 c3fdf89c98fa8818febcc94af5c11af2501d2008 files/rox-start 1116
 SHA256 13681414d1e98bd58d49ac2e1f2aff2670f2fa02b1172a9d9e39bc9d069bfe15 files/rox-start 1116
-AUX rox.desktop 129 RMD160 c5459a63931c192e8bfd35c6217e64bf89a1e4fe SHA1 decf5832e1820f52e011591356cc7acaaef03988 SHA256 2625bc60ad53423c606a4c63b12a5036260f88ab81b1febcc1a0d176078ee7c7
-MD5 9728f20caf48a18abe4a5ddbe4922b06 files/rox.desktop 129
-RMD160 c5459a63931c192e8bfd35c6217e64bf89a1e4fe files/rox.desktop 129
-SHA256 2625bc60ad53423c606a4c63b12a5036260f88ab81b1febcc1a0d176078ee7c7 files/rox.desktop 129
 DIST ROX-Session-0.1.21.tgz 940915 RMD160 c1cc7ccc8a7d6b739a67762f58f055fcbc9ccd28 SHA1 2f033fac882c76870349991c032f10927dd561f3 SHA256 e2405c9d76afd6c5442ecef891be0a31490cb2b663ee7622f4b949afb4225af4
 DIST rox-session-0.27.tar.bz2 128791 RMD160 6990c53df2dd4f3b281ab93105ab95ddf37c24fe SHA1 4f410825cb1c66487c13d8e3706a237a6e5d559f SHA256 d4c7f8d0eb2fcb577777cc64a94f723793fcdde6a499fc80e595bbf18a13325d
 DIST rox-session-0.29.tar.bz2 130948 RMD160 1a9cbd125db8b3c949a04e798ebefa482b0e57ee SHA1 318833b3cb9901e72f2be432c9d32bc5e68c825e SHA256 c0899a372d7d39c787ae2cc3e02649dd1d6957156829f1689c7d3600f6e0d5b6
@@ -17,14 +13,14 @@ EBUILD rox-session-0.27-r1.ebuild 1359 RMD160 7d19085de0a652920f6c240f65ab9e200d
 MD5 aafc379b1665f6b44fd548b8b1fdb047 rox-session-0.27-r1.ebuild 1359
 RMD160 7d19085de0a652920f6c240f65ab9e200de750d0 rox-session-0.27-r1.ebuild 1359
 SHA256 bdc11974720d59c352a632afd8994152bb0dd66fcb3269c99a2e5ba6f27dd4b0 rox-session-0.27-r1.ebuild 1359
-EBUILD rox-session-0.29.ebuild 1670 RMD160 6ed105b808b848c00ec90809b89b95472be5f0c3 SHA1 95d5c57f4c3098012aefd78438c8d1840d45f885 SHA256 8463e7d2fa80c31d5612de7e89bdcdba4fff1a288c85f366c018eeae2c406998
-MD5 24717fe4e577dd60ea2ac3dca0cff4f9 rox-session-0.29.ebuild 1670
-RMD160 6ed105b808b848c00ec90809b89b95472be5f0c3 rox-session-0.29.ebuild 1670
-SHA256 8463e7d2fa80c31d5612de7e89bdcdba4fff1a288c85f366c018eeae2c406998 rox-session-0.29.ebuild 1670
-MISC ChangeLog 3696 RMD160 06697f91021cdd298defdf4d018ac8eb79162181 SHA1 d4252d224e21aa5d8d937d27f9b5af3a5cc8d025 SHA256 1188312b69e8f76369ef98dac290e797197d845f57334ace1879f80421797a79
-MD5 dd53eb4d74a7fdeb660d34e467e11de3 ChangeLog 3696
-RMD160 06697f91021cdd298defdf4d018ac8eb79162181 ChangeLog 3696
-SHA256 1188312b69e8f76369ef98dac290e797197d845f57334ace1879f80421797a79 ChangeLog 3696
+EBUILD rox-session-0.29.ebuild 1666 RMD160 cfda141c1807aabf4e731c11e0794bb6bed8afbd SHA1 ec6a3c7e137033fc522fd6f22c6c712e5aef70be SHA256 0d43fd93763ef2b7d592bb06331f23790f90720ecda455c60e9239a90579513f
+MD5 8c58212ef423805808d72a3f5634f22b rox-session-0.29.ebuild 1666
+RMD160 cfda141c1807aabf4e731c11e0794bb6bed8afbd rox-session-0.29.ebuild 1666
+SHA256 0d43fd93763ef2b7d592bb06331f23790f90720ecda455c60e9239a90579513f rox-session-0.29.ebuild 1666
+MISC ChangeLog 3839 RMD160 16a684073588afe7b8dbef8bd3ef90cd7e1c1d04 SHA1 63de93429f7188773c7534419f6826b8b61d3db8 SHA256 9f18da65194eb34b2a80f99cbfa1696193b6f4e98b0ce1308eee8a28cb53ffba
+MD5 f6ac49ea57330b5cb16a1fe347b92685 ChangeLog 3839
+RMD160 16a684073588afe7b8dbef8bd3ef90cd7e1c1d04 ChangeLog 3839
+SHA256 9f18da65194eb34b2a80f99cbfa1696193b6f4e98b0ce1308eee8a28cb53ffba ChangeLog 3839
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157

diff --git a/rox-base/rox-session/files/rox.desktop b/rox-base/rox-session/files/rox.desktop
deleted file mode 100644 (file)
index 2b98f1a..0000000
--- a/rox-base/rox-session/files/rox.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=ROX
-Comment=This session logs you into the ROX desktop
-Exec=/usr/bin/rox-start
-Type=XSession

diff --git a/rox-base/rox-session/rox-session-0.29.ebuild b/rox-base/rox-session/rox-session-0.29.ebuild
index e965fc8ab540900e5c80cb684f0589dfafe5d4f5..fb2a21a4469d737e4f5899d1f378bc50a03b0676 100644 (file)
--- a/rox-base/rox-session/rox-session-0.29.ebuild
+++ b/rox-base/rox-session/rox-session-0.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.29.ebuild,v 1.1 2007/01/30 16:59:22 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.29.ebuild,v 1.2 2007/01/30 17:53:05 lack Exp $
 
 ROX_LIB_VER="2.0.0"
 inherit eutils rox
@@ -41,13 +41,12 @@ src_install() {
 
        dobin "${FILESDIR}/rox-start"
 
-       dodir /usr/share/xsessions
-       insinto /usr/share/xsessions
-       doins "${FILESDIR}/rox.desktop"
+       local wm="rox"
+       make_session_desktop "ROX Desktop" /usr/bin/rox-start
 
        dodir /etc/X11/Sessions
-       echo "/usr/bin/rox-start" > "${D}/etc/X11/Sessions/ROX"
-       fperms a+x /etc/X11/Sessions/ROX
+       echo "/usr/bin/rox-start" > "${D}/etc/X11/Sessions/ROX_Desktop"
+       fperms a+x /etc/X11/Sessions/ROX_Desktop
 }
 
 pkg_postinst() {