summaryrefslogtreecommitdiffstats
path: root/kde
diff options
context:
space:
mode:
authorOlivier DOSSMANN <blankoworld@wanadoo.fr>2009-11-18 07:45:30 +0100
committerOlivier DOSSMANN <blankoworld@wanadoo.fr>2009-11-18 07:45:30 +0100
commit171b0d7335c7d6b1af1c05584b9d9c498f767dbf (patch)
tree7d1788ce58be566d41349040cffc9264c06f0326 /kde
parente19affe6bbdd66ebfeb1399d8d14cad5f3c2be63 (diff)
parented494fbcdfddb1d0f5013567667744d14d27ec84 (diff)
downloadnutyx-extra-171b0d7335c7d6b1af1c05584b9d9c498f767dbf.tar.gz
nutyx-extra-171b0d7335c7d6b1af1c05584b9d9c498f767dbf.tar.bz2
nutyx-extra-171b0d7335c7d6b1af1c05584b9d9c498f767dbf.tar.xz
nutyx-extra-171b0d7335c7d6b1af1c05584b9d9c498f767dbf.zip
Merge remote branch 'nutyx-2009/master'
Diffstat (limited to 'kde')
-rw-r--r--kde/kdebase-workspace/.footprint16
-rw-r--r--kde/kdebase-workspace/.md5sum1
-rwxr-xr-xkde/kdebase-workspace/Pkgfile12
3 files changed, 24 insertions, 5 deletions
diff --git a/kde/kdebase-workspace/.footprint b/kde/kdebase-workspace/.footprint
index 0ad954601..2e897c632 100644
--- a/kde/kdebase-workspace/.footprint
+++ b/kde/kdebase-workspace/.footprint
@@ -648,6 +648,22 @@ drwxr-xr-x root/root opt/kde/share/apps/kdm/sessions/
-rw-r--r-- root/root opt/kde/share/apps/kdm/sessions/xfce.desktop
-rw-r--r-- root/root opt/kde/share/apps/kdm/sessions/xfce4.desktop
drwxr-xr-x root/root opt/kde/share/apps/kdm/themes/
+drwxr-xr-x root/root opt/kde/share/apps/kdm/themes/carbon/
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/1280x800.jpg
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/KdmGreeterTheme.desktop
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/caps.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/carbon.xml
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/icon-kde.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/pw-entry-li.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/pw-entry.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/screenshot.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/session_button-li.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/session_button.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/system_button-li.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/system_button.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/user-entry-li.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/user-entry.png
+-rwxr-xr-x install/root opt/kde/share/apps/kdm/themes/carbon/win-login.png
drwxr-xr-x root/root opt/kde/share/apps/kdm/themes/circles/
-rw-r--r-- root/root opt/kde/share/apps/kdm/themes/circles/KdmGreeterTheme.desktop
-rw-r--r-- root/root opt/kde/share/apps/kdm/themes/circles/background.svg
diff --git a/kde/kdebase-workspace/.md5sum b/kde/kdebase-workspace/.md5sum
index 3ff568b2e..fef1b788c 100644
--- a/kde/kdebase-workspace/.md5sum
+++ b/kde/kdebase-workspace/.md5sum
@@ -1,5 +1,6 @@
381772c7b73076ade63ea724637e2f1a NuTyXlogo.png
88a7a094728a782ae74b8c443cca0c82 Xsession.kde4
+84734ed5eca3f1b38354a82e0a9139a5 carbon-kdm.tar.gz
304ef605ca6fc78f538ef38f7ae93b26 ede.desktop
0af67c6ee6385cc86f694bc8e1675ddb kdebase-workspace-4.3.3.tar.bz2
a6e11d5c5320bdd96e6d7d01a9317e9b kdm
diff --git a/kde/kdebase-workspace/Pkgfile b/kde/kdebase-workspace/Pkgfile
index 1b699b513..ad8f2f652 100755
--- a/kde/kdebase-workspace/Pkgfile
+++ b/kde/kdebase-workspace/Pkgfile
@@ -6,9 +6,10 @@
name=kdebase-workspace
version=4.3.3
-release=1
+release=2
source=(http://download.kde.org/stable/$version/src/$name-$version.tar.bz2\
- kdm lxde.desktop ede.desktop Xsession.kde4 NuTyXlogo.png)
+ kdm lxde.desktop ede.desktop Xsession.kde4 NuTyXlogo.png\
+ http://kiao.no-ip.info/NuTyX/files/carbon-kdm.tar.gz)
build() {
mkdir -v -p $PKG/etc/kde
@@ -24,6 +25,7 @@ build() {
ln -svf ../init.d/kdm $PKG/etc/rc.d/rc6.d/K10kdm
cd $name-$version
+ sed -i "s/kdelogo/NuTyXlogo/" kwin/clients/redmond/redmond.cpp
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=$KDE_PREFIX \
@@ -35,13 +37,13 @@ build() {
$PKG/$KDE_PREFIX/share/apps/kdm/sessions/
install -m755 ../Xsession.kde4 \
$PKG/$KDE_PREFIX/share/config/kdm/Xsession
+ cp -a ../carbon \
+ $PKG/$KDE_PREFIX/share/apps/kdm/themes/
sed -i "s/AllowRootLogin=false/AllowRootLogin=true/" \
$PKG/$KDE_PREFIX/share/config/kdm/kdmrc
sed -i "s@gnome-session@/opt/gnome/bin/gnome-session@" \
$PKG/$KDE_PREFIX/share/apps/kdm/sessions/gnome.desktop
-# sed -i "s@opt/kde/@opt/kde4@" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
-# sed -i "/Theme=\/opt/d" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
- sed -i "s/kdelogo.png/NuTyXlogo.png/" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
+ sed -i "s/oxygen-air/carbon/" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
sed -i "s/xdm.pid/kdm.pid/" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
sed -i "s/#Language=de_DE/Language=fr_FR/" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
mv ../NuTyXlogo.png $PKG/$KDE_PREFIX/share/apps/kdm/pics/