diff --git a/Makefile b/Makefile index ce73388..cdabe37 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -# Makefile for openmamba-desktop-base -# Copyright (C) 2004-2010 by Silvan Calarco +# Makefile for openmamba-desktop-kde4 +# Copyright (C) 2004-2012 by Silvan Calarco # Copyright (C) 2005-2007 by Davide Madrisan include VERSION @@ -66,7 +66,6 @@ INSTALL_DATA = ${INSTALL} -m 644 INSTALL_DIR = ${INSTALL} -d -m 755 INSTALL_SCRIPT = ${INSTALL_PROGRAM} -pck_kdedesktop = $(wildcard kde/desktop/*.bz2) #pck_srpms = flashplugin jre msttcorefonts win32codecs pck_srpms = flashplugin msttcorefonts win32codecs skype @@ -127,10 +126,6 @@ install-kde-distro-addons: dist-update $(INSTALL_DATA) etc/pam.d/kde $(DESTDIR)$(sysconfdir)/pam.d/ $(INSTALL_DATA) etc/pam.d/kde-np $(DESTDIR)$(sysconfdir)/pam.d/ $(INSTALL_DATA) etc/sudoers.d/kde4 $(DESTDIR)$(sysconfdir)/sudoers.d/kde4 - $(INSTALL_SCRIPT) kde/scripts/startkde-firsttime.sh $(DESTDIR)$(xprofiledir) - $(INSTALL_SCRIPT) kde/scripts/startkde.firsttime $(DESTDIR)$(kdebindir) - $(INSTALL_SCRIPT) kde/scripts/startkde.firsttime $(DESTDIR)$(kdebindir) - $(INSTALL_DATA) $(pck_kdedesktop) $(DESTDIR)$(distrokdedir) cp -r kde/apps $(DESTDIR)$(kdedatadir) $(INSTALL_DATA) kde/autostart/mambatray.desktop $(DESTDIR)$(kdeautostartdir)/mambatray.desktop $(INSTALL_DATA) kde/config/compizrc $(DESTDIR)$(kdeconfigdir)/compizrc diff --git a/VERSION b/VERSION index 7fac77e..89c60ae 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,3 @@ VERSION = 2.3.0 + diff --git a/kde/desktop/desktop-common.tar.bz2 b/kde/desktop/desktop-common.tar.bz2 deleted file mode 100644 index 3c873d9..0000000 Binary files a/kde/desktop/desktop-common.tar.bz2 and /dev/null differ diff --git a/kde/desktop/desktop-en.tar.bz2 b/kde/desktop/desktop-en.tar.bz2 deleted file mode 100644 index cc31317..0000000 Binary files a/kde/desktop/desktop-en.tar.bz2 and /dev/null differ diff --git a/kde/desktop/desktop-es.tar.bz2 b/kde/desktop/desktop-es.tar.bz2 deleted file mode 100644 index 3da174f..0000000 Binary files a/kde/desktop/desktop-es.tar.bz2 and /dev/null differ diff --git a/kde/desktop/desktop-fr.tar.bz2 b/kde/desktop/desktop-fr.tar.bz2 deleted file mode 100644 index ad97efb..0000000 Binary files a/kde/desktop/desktop-fr.tar.bz2 and /dev/null differ diff --git a/kde/desktop/desktop-it.tar.bz2 b/kde/desktop/desktop-it.tar.bz2 deleted file mode 100644 index f38de01..0000000 Binary files a/kde/desktop/desktop-it.tar.bz2 and /dev/null differ diff --git a/kde/scripts/startkde-firsttime.sh b/kde/scripts/startkde-firsttime.sh deleted file mode 100755 index 88ebe74..0000000 --- a/kde/scripts/startkde-firsttime.sh +++ /dev/null @@ -1,8 +0,0 @@ -# KDE4 first time configuration script -# -# Copyright (C) 2009 Silvan Calarco -# - -if [ "$session" = "/opt/kde/bin/startkde" -o "$session" = "default" ]; then - [ -e $HOME/Desktop ] || /opt/kde/bin/startkde.firsttime -fi diff --git a/kde/scripts/startkde.firsttime.in b/kde/scripts/startkde.firsttime.in deleted file mode 100644 index 49b4daf..0000000 --- a/kde/scripts/startkde.firsttime.in +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# -# startkde.firsttime - KDE firsttime script for @distroID@ -# -# This file is called by startkde after the kpersonalizer has been -# executed for first access configuration -# -# Copyright (c) 2005-2009 by Silvan Calarco -# Copyright (c) 2007 by Davide Madrisan - -case "$LANG" in - es*) LANG_ADD=es ;; - fr*) LANG_ADD=fr ;; - it*) LANG_ADD=it ;; - *) LANG_ADD=en ;; -esac - -kdeprefix=$(kde4-config --prefix 2>/dev/null) || exit 1 - -if [ -r @distrokdedir@/desktop-$LANG_ADD.tar.bz2 ]; then - mkdir -p $HOME/Desktop - ( cd $HOME/Desktop >/dev/null - tar xjf @distrokdedir@/desktop-common.tar.bz2 - tar xjf @distrokdedir@/desktop-$LANG_ADD.tar.bz2 ) -fi - -## launch keyboard configuration tool for english (international) version -#[ "$LANG_ADD" = "en" ] && kcmshell keyboard_layout - -exit 0