Add the executable bit to the lxde session file. Bug #437010. Move it directly to stable so everyone can benefit from it

Package-Manager: portage-2.1.11.26/cvs/Linux x86_64
RepoMan-Options: --force

3 files changed, 70 insertions, 15 deletions

diff --git a/lxde-base/lxde-common/ChangeLog b/lxde-base/lxde-common/ChangeLog
index 8dd1b13b63e8..d8d6397522f0 100644
--- a/lxde-base/lxde-common/ChangeLog
+++ b/lxde-base/lxde-common/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxde-common
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.37 2012/08/25 00:01:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.38 2012/10/15 18:30:03 hwoarang Exp $
+
+*lxde-common-0.5.5-r3 (15 Oct 2012)
+
+  15 Oct 2012; Markos Chandras <hwoarang@gentoo.org>
+  +lxde-common-0.5.5-r3.ebuild:
+  Add the executable bit to the lxde session file. Bug #437010. Move it directly
+  to stable so everyone can benefit from it
 
   25 Aug 2012; Markos Chandras <hwoarang@gentoo.org> -lxde-common-0.4.2.ebuild,
   -lxde-common-0.5.0-r1.ebuild, -lxde-common-0.5.0-r2.ebuild,
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
index a858cf2eb031..040ef4c7fc01 100644
--- a/lxde-base/lxde-common/Manifest
+++ b/lxde-base/lxde-common/Manifest
@@ -7,22 +7,23 @@ AUX lxde-common-0.5.0-session-fix.patch 455 SHA256 927c3383337a79f50445ae633a4a4
 AUX lxde-common-0.5.5-logout.patch 415 SHA256 04597937631a4325dd9e9abacb19cd522b34909dec8ba781a84250ab150eda55 SHA512 5437f15a0f5fd892751ef37289479e7fee6cc253a2724c972f8d5b32a7e7283e937edbf659ea205b2dbc26c0f5d2db00251229f134c77a4ea0ef5a17d63dba48 WHIRLPOOL 49a7145981eebe9229412b9bf420ba326ae3769482d2056283227c6efa208a631300e52744575a93fa33a861f2b629b6580b6e1d52c5ce385b11e41f5e2a48d5
 DIST lxde-common-0.5.5.tar.gz 899075 SHA256 ee18a09b64a442b33c1b54f0269649a1b4d9490460c400a07ed785d41bf6dde6 SHA512 44848286ccf3aa269df1680e14a8d3c41be1c2af956bd5121fc05d97a892fdc13d1e74191a2a11a40e96a8f31f8be37b1cfb9afeac4474fcab88d07508647c7f WHIRLPOOL 60423eb159fabba12394609b7538e63342c8c39ca38be441d930923deb25116ff1bc0e01d6aa25cfd53d202b426cd9b9fac9410de9c07f211e1b753fe44d4264
 EBUILD lxde-common-0.5.5-r2.ebuild 1143 SHA256 64d9fff3332cdabc2a2ef0a268726139aff6f2f7681e2741b37799dba2be3beb SHA512 40400574c277357ea714010a4cd6f88af9de8f546ff993c9bd8c2af12e1f0a6a95b9231ffae4ef00d929119592ec024b8ea43b3a762ba7b50b6efe393e2ac87f WHIRLPOOL 6f6cb8090680d24f4de589fdff5b507c8773fdda042e0e97f4398e9c8b2a6571fa0e2dcd6fe3fdff44b1832c6164e4a65403c08d33760fec67db7552418bb1e6
-MISC ChangeLog 5315 SHA256 a6b92896c11e9cef6602281431a7103080c49a5e6cd4a2635d74214fd433102e SHA512 eaab27176e1f4af703107566cfec17a080f63bff3a1741a8480bed3da9183e5d6e89b8e1dd929a4d81d75c2bd6aeb52b14a5fff255cc7be54ecaf21383c082af WHIRLPOOL 2cd2a60e883d04ef459dc851eadce6f43469ea01a706f6d401adcc60b28d9b9c8763b063d0a5dd309904308ed0aeae7f72056a67b54adcfad8c46a20131aeaf3
+EBUILD lxde-common-0.5.5-r3.ebuild 1182 SHA256 9521047711b4a0926bc6c12f24c0e7936b5a18ba36fef37c935050a18da12aa1 SHA512 aefb76f996e34b491dcfc0cb2f1e9b27be4f9b4a1a0bb74ab145476acb21c00f657f5921099d94becd2a154e594bda4f0c603bdf9d735d4374df58e584d63f72 WHIRLPOOL e0c7fad0fcb9068adb47b6bb30358900434a913eb32ffc9a57a3fa77ae65924735a48e167e0cf06d57f77e33a1e16c2541dd2d53c8cd03bca0a15400ba3880da
+MISC ChangeLog 5563 SHA256 f9b2bec7ddbf9b3c84303786edb9f310f027668f64395631cdc421b9be49d6fd SHA512 5a7a5f6c35e0159abc9d3790828c1e399f1b8c991eed0ae435ffdfef80c24560c808dbcbec203955fdaec20556108277a4e0171bc0042b62befc529a13a319c8 WHIRLPOOL bf9f44fbd499d254c73205ae1d57559a12ac8c8f87436ae2d7c5f8ff0d1cfb7ba8d79a75c7e1def45b672a5acebcef6b70548367465df9af412572e7e6eca470
 MISC metadata.xml 159 SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb SHA512 b4d06538d607c5ba81e0070475cd7d0a221b19e2adf740f479398a647c97350eb6d02b7db8bde107b0c369ce0058b8f0639468c0ca519ff585c555a0bfd4a381 WHIRLPOOL f5dfee2db356573e21cdb76ebcd11a61d2dc7f2b2b8458589cdabb1b2fd21f3261d0b40144b1417d433d1078a9c31a6b4562a914068719df66dfd4563714d9ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQOBXkAAoJEPqDWhW0r/LClQ8P/3Oqikg801rHvUhmrc0z49pc
-eMry4rUzNoc7kugLy9QhY0gXs1Db1p7tX6HpVDq9yHjhmbLc2GmpWylPdt4eerAC
-u7VBbmRiTromD8qyY/IhAjLb9b8EVEL3AfzDt152SqSha9o6pwABMgmIf3J0H6pF
-hCLWQHtztr+6ydT6zM99zsg1wlNChT/1qp8aLEdgWHe5YAMXRwh5XqKaQIixhmk+
-BzgAnRVpjZ9Ip/R2Oik0LYb52U1ZwbOsx3nYouWRFZ+NQU++PZXeI5UijUpPNrIQ
-V+hA2A7ohNoR4q8MnxIpTsu7B3mFCoLkiyXB9i9wgQMVnx4DC6CvQ2AV3gAanM9x
-4y9HizGDL4d5cLY46TRnViEHg5LG4yMMkeG3ORJhxe84E7jICu2Lsb9q/LOEFtKh
-A7m0MBi0G8v3mGMKqQfBaMCPtSjld5gjkKFU+JxI9hxDYJiG3Z2RkZxWVes6S2bB
-ObCnrTZaETLIrJ5pTM9rSCQz0EuV34BRA1MUzJQKnQGsxpiYqecZW+JI5v2tEmAE
-AWKKtklCuEyrFsQ7/bfNBqlMW88IJ8jFZ8SxuKbOU3aG5YxyoVRhAlPUjP03epJc
-bavItSmZexlC3Q1oVOsBtsOE5Un24B46oqh9TY/RqgPMS2/zjJwuyXQNJN3VBJTn
-HDzQdio1x23cxK83lNFf
-=W3gW
+iQIcBAEBCAAGBQJQfFYrAAoJEPqDWhW0r/LCQ2QP/0qca+Db/iTYYhjSZ+XLPi50
+fxN7VLmfnXvFhPqXKDjjUpFhcRTs9Gn/pXb/QVpfKGb2hy+68FaZgUKEtJNSU9Yy
+eR7HuoRbeeDAQ0Zwimte7jufl36+vcnJC2r9i30ReE3oXguPY/ww32QMtY3RP23V
+e3dVOZ/QE6g9VSAaDYbt5ApWWle4+52Y1rDN8XNuo3p2A9t3eLwmzbS01g7EWpnz
+/XOUXAaUS7kIXM8CnowVm9/3Esm9vS9cJMi4iz6dP4H2g5ybBtHX+MqeS6TMb6OP
++2Pjo6fpLbj9SA3NsWu8yfKVHRJuYY7eEJr7IUsX40qIQiYtQXZ2hYvoLtx4Qw5D
+sMaWXP47dG+BlAIRfbt8QHHFupqRA4Ohr0vQha4mtzY9twVsfOFyiiAD1NSm9sM8
+8AbXCHCpY6OIwG8y1KXVl1H3A5FlLas0Qzi9Xzoe0iHUOzByB2Eeg2bS30Gc6uo1
+zRXIpQMrgAoWKQwhoS1zU2RwfEJ4VNoqoc/JXIklzNZaLf10CkB1Pb6MuJIWEcZ8
+gIqFRUbbq9FPDjwRuDkghJ6rsOY5AB/GTiwORo34rfGFxsC6WeBCSDo7s7NqvBgf
+4TGTQwQBBWg11Qi+cup00UACBfyiOwSi97SIO2mQ7ntaok7M34VzP71QJnIk+gJE
+HMOucsrP6Q0fy2qQOgT7
+=ZHxJ
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxde-common/lxde-common-0.5.5-r3.ebuild b/lxde-base/lxde-common/lxde-common-0.5.5-r3.ebuild
new file mode 100644
index 000000000000..b15dd9828390
--- /dev/null
+++ b/lxde-base/lxde-common/lxde-common-0.5.5-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/lxde-common-0.5.5-r3.ebuild,v 1.1 2012/10/15 18:30:03 hwoarang Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ppc x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext"
+PDEPEND="lxde-base/lxde-icon-theme"
+
+src_prepare() {
+	#bug 380043
+	epatch "${FILESDIR}"/${P}-logout.patch
+
+	# Rerun autotools
+	einfo "Regenerating autotools files..."
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	# install session file
+	insinto /etc/X11/Sessions/
+	doins ${FILESDIR}/lxde
+	fperms 755 /etc/X11/Sessions/lxde
+	dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+	elog "${P} has renamed the configuration file name to"
+	elog "/etc/xdg/lxsession/LXDE/desktop.conf"
+	elog "Keep in mind you have to migrate your custom settings"
+	elog "from /etc/xdg/lxsession/LXDE/config"
+}