[gentoo-commits] proj/ltsp:master commit in: x11-misc/ldm/

["Wim Muskee" <wimmuskee@gmail.com>]

commit:     0af2e89b0eb0e980e942e3116ccd64014e7ee05c
Author:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
AuthorDate: Mon Jun  6 16:03:42 2011 +0000
Commit:     Wim Muskee <wimmuskee <AT> gmail <DOT> com>
CommitDate: Mon Jun  6 16:03:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ltsp.git;a=commit;h=0af2e89b

ldm: Version bump to 2.2.2.

---
 x11-misc/ldm/ChangeLog                             |    4 ++
 x11-misc/ldm/Manifest                              |    7 ++--
 .../ldm/{ldm-2.2.1.ebuild => ldm-2.2.2.ebuild}     |    6 +++-
 x11-misc/ldm/ldm-2.2.ebuild                        |   33 --------------------
 x11-misc/ldm/ldm-9999.ebuild                       |    4 ++
 5 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/x11-misc/ldm/ChangeLog b/x11-misc/ldm/ChangeLog
index d09d4be..2a7f548 100644
--- a/x11-misc/ldm/ChangeLog
+++ b/x11-misc/ldm/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ldm-2.2.2 (06 06 2011)
+  06 06 2011; Wim Muskee wimmuskee@gmail.com ldm-2.2.2.ebuild:
+  Version bump.
+
   01 04 2011; Wim Muskee wimmuskee@gmail.com ldm-9999.ebuild:
   Added pkgconfig and intltool deps.
   

diff --git a/x11-misc/ldm/Manifest b/x11-misc/ldm/Manifest
index c8ef370..03dd6a6 100644
--- a/x11-misc/ldm/Manifest
+++ b/x11-misc/ldm/Manifest
@@ -1,6 +1,5 @@
 EBUILD ldm-2.1.3.ebuild 699 RMD160 02082fcfcf755ed1973a14c6fff227efe3fd0d85 SHA1 c10fc846e6fdcc76e1658a9a5158222d8507fc5c SHA256 e26bd04ccf5a55895ab6ae692198731dbe91f7125f1da5fa8fe4ab48d9b9cbb7
-EBUILD ldm-2.2.1.ebuild 698 RMD160 42e3103704d285274002f03766d0f8258c9aa8cc SHA1 e67330b4b2d52de6a91286716f4419a45e975c11 SHA256 2cdf29e09594875989f43e33089a4181ec68cbc36c941bf2c8367cfc9786d5f8
-EBUILD ldm-2.2.ebuild 698 RMD160 4cd923358b25eb8c0f629a9bbcec577dcbb3bf41 SHA1 1b6f311f2eacba0478319f4812425ae7e695570c SHA256 64f3463c33fa4c3127cfd4e1cecc0324a6592f560b7a507e047ddc2255acf7f0
-EBUILD ldm-9999.ebuild 676 RMD160 e2eb6da7779d5eee60dff380c2d9b0c662ce30fd SHA1 63ac44317b5660f13d913b4fba8d48ad0a58ae51 SHA256 311cc10dacceb634214d27764f11522926db0e6e22bb85b15fe4657ff42a25a7
-MISC ChangeLog 1357 RMD160 ab96081f0c5ef25d42f43e2617d3223ff97ea8a0 SHA1 593dacddf93da0fd4abb79cdda120cbb7261699f SHA256 f1ab01b0348c3a18fa82ac4856bc33e711ea61c73d97f8072e6d3d5048574bae
+EBUILD ldm-2.2.2.ebuild 774 RMD160 b6bb076645df0d7011e500ffacc871e5c6948d90 SHA1 b1c33ccd68d286e228c3b7d282ad6f10d51fc2cf SHA256 e6adb56d3f935934a013645438d9a7e94b0f2f00bed96d86096073f9f94cdb3e
+EBUILD ldm-9999.ebuild 755 RMD160 9f04272a65a3c50ddb9a621b2344659558717b89 SHA1 0c29d7d32a02027cdfaf8bd5d87b14e077f36d38 SHA256 fa479bd6fa5dd9a51849d4b3d4e419d31552d5d5f880b2bcc2cf9c57028b19b5
+MISC ChangeLog 1461 RMD160 f39d57eb3dddfeefbfec2d049db3679ddde55a57 SHA1 bc815b010b2e23908296786adc843219a670fbce SHA256 949f192348f675c82a016f0f4380355d5659c9743340d5404ba94f7e25e48554
 MISC metadata.xml 239 RMD160 5c09d64ce69a1c3ead8110ab2cc4242f4b79d361 SHA1 3569156a75f6a3e70bf78fec27420754f42f709c SHA256 81174591b128a73f77bd663c79dc842ce8df791b8b1b498d99c3aa1116a80a40

diff --git a/x11-misc/ldm/ldm-2.2.1.ebuild b/x11-misc/ldm/ldm-2.2.2.ebuild
similarity index 87%
rename from x11-misc/ldm/ldm-2.2.1.ebuild
rename to x11-misc/ldm/ldm-2.2.2.ebuild
index 953ee90..65efe51 100644
--- a/x11-misc/ldm/ldm-2.2.1.ebuild
+++ b/x11-misc/ldm/ldm-2.2.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EBZR_REVISION="1363"
+EBZR_REVISION="1386"
 EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk"
 EBZR_BOOTSTRAP="autogen.sh"
 
@@ -30,4 +30,8 @@ src_unpack() {
 src_install() {
 	emake DESTDIR="${D}" install
 	dosym ltsp /usr/share/ldm/themes/default
+	
+	dodoc README
+	dodoc README-DEVELOPMENT-POLICY
+	dodoc LTSP_LOGO_COPYRIGHT
 }

diff --git a/x11-misc/ldm/ldm-2.2.ebuild b/x11-misc/ldm/ldm-2.2.ebuild
deleted file mode 100644
index 659cb06..0000000
--- a/x11-misc/ldm/ldm-2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EBZR_REVISION="1360"
-EBZR_REPO_URI="http://bazaar.launchpad.net/~ltsp-upstream/ltsp/ldm-trunk"
-EBZR_BOOTSTRAP="autogen.sh"
-
-inherit bzr
-
-DESCRIPTION="LTSP Display Manager"
-HOMEPAGE="http://www.ltsp.org/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-libs/glib-2.21
-	>=x11-libs/gtk+-2.18
-	app-text/iso-codes
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35.0"
-RDEPEND="${DEPEND} x11-themes/gtk-engines
-	x11-apps/xdm
-	x11-base/xorg-server"
-
-src_unpack() {
-	bzr_src_unpack
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dosym ltsp /usr/share/ldm/themes/default
-}

diff --git a/x11-misc/ldm/ldm-9999.ebuild b/x11-misc/ldm/ldm-9999.ebuild
index c669113..bbe213c 100644
--- a/x11-misc/ldm/ldm-9999.ebuild
+++ b/x11-misc/ldm/ldm-9999.ebuild
@@ -29,4 +29,8 @@ src_unpack() {
 src_install() {
 	emake DESTDIR="${D}" install
     dosym ltsp /usr/share/ldm/themes/default
+    
+	dodoc README
+	dodoc README-DEVELOPMENT-POLICY
+	dodoc LTSP_LOGO_COPYRIGHT
 }