fix sedding of kdmrc - see changelog file

4 files changed, 12 insertions, 7 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 9097f9e66ab9..a3c3a214ba6b 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.22 2002/08/23 11:48:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.23 2002/08/29 14:59:56 danarmak Exp $
+
+  29 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix the sed on kdmrc so that it expands kde- into e.g. kde-3.0.3, and
+  desn't add a literal '' to the session list.
 
   23 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
diff --git a/kde-base/kdebase/kdebase-3.0.2.ebuild b/kde-base/kdebase/kdebase-3.0.2.ebuild
index 9de52b3679f2..ab08ae109716 100644
--- a/kde-base/kdebase/kdebase-3.0.2.ebuild
+++ b/kde-base/kdebase/kdebase-3.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.2.ebuild,v 1.12 2002/08/14 13:08:53 murphy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.2.ebuild,v 1.13 2002/08/29 14:59:56 danarmak Exp $
 inherit kde-dist
 
 DESCRIPTION="KDE $PV - base packages: the desktop, panel, window manager, konqueror..."
@@ -73,7 +73,7 @@ ${KDEDIR}/bin/startkde" > kde-${PV}
 
     cd ${D}/${KDEDIR}/share/config/kdm || die
     mv kdmrc kdmrc.orig
-    sed -e 's:SessionTypes=:SessionTypes=kde-3.0,kde-2.2.2,:' kdmrc.orig > kdmrc
+    sed -e "s:SessionTypes=:SessionTypes=kde-3.0,kde-2.2.2,:" kdmrc.orig > kdmrc
     rm kdmrc.orig
 
     #backup splashscreen images, so they can be put back when unmerging 
diff --git a/kde-base/kdebase/kdebase-3.0.3.ebuild b/kde-base/kdebase/kdebase-3.0.3.ebuild
index 7b92b2ddc607..9de0b841f5fe 100644
--- a/kde-base/kdebase/kdebase-3.0.3.ebuild
+++ b/kde-base/kdebase/kdebase-3.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.3.ebuild,v 1.2 2002/08/23 11:48:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.0.3.ebuild,v 1.3 2002/08/29 14:59:56 danarmak Exp $
 inherit kde-dist
 
 DESCRIPTION="KDE $PV - base packages: the desktop, panel, window manager, konqueror..."
@@ -69,7 +69,7 @@ ${KDEDIR}/bin/startkde" > kde-${PV}
 
     cd ${D}/${KDEDIR}/share/config/kdm || die
     mv kdmrc kdmrc.orig
-    sed -e 's:SessionTypes=:SessionTypes=kde-3.0,kde-2.2.2,:' kdmrc.orig > kdmrc
+    sed -e "s:SessionTypes=:SessionTypes=kde-$PV,:" kdmrc.orig > kdmrc
     rm kdmrc.orig
 
     #backup splashscreen images, so they can be put back when unmerging 
diff --git a/kde-base/kdebase/kdebase-3.1_beta1.ebuild b/kde-base/kdebase/kdebase-3.1_beta1.ebuild
index 5e8c53e11f15..83e530316079 100644
--- a/kde-base/kdebase/kdebase-3.1_beta1.ebuild
+++ b/kde-base/kdebase/kdebase-3.1_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1_beta1.ebuild,v 1.1 2002/08/22 21:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.1_beta1.ebuild,v 1.2 2002/08/29 14:59:56 danarmak Exp $
 inherit kde-dist
 
 DESCRIPTION="KDE $PV - base packages: the desktop, panel, window manager, konqueror..."
@@ -66,7 +66,7 @@ ${KDEDIR}/bin/startkde" > kde-${PV}
 
     cd ${D}/${KDEDIR}/share/config/kdm || die
     mv kdmrc kdmrc.orig
-    sed -e 's:SessionTypes=:SessionTypes=kde-${PV},:' \
+    sed -e "s:SessionTypes=:SessionTypes=kde-${PV},:" \
 	-e "s:Session=${PREFIX}/share/config/kdm/Xsession:Session=/etc/X11/xdm/Xsession:"  kdmrc.orig > kdmrc
     rm kdmrc.orig