Release 2.3.5

Signed-off-by: Stefano Cotta Ramusino <stefano.cotta@openmamba.org>

Makefile

@@ -1,14 +1,16 @@
 # Makefile for openmamba-desktop-base
-# Copyright (C) 2004-2009 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2004-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com>
 
 include VERSION
 include SRPMSVERSIONS
 
 PACKAGE = desktop-base-openmamba
-
 DISTROID = openmamba
 
+WITHKDE3 := 1
+WITHKDE3TOOLS := 1
+
 RPM_VENDOR = openmamba
 RPM_DISTRIBUTION = openmamba
 RPM_DISTROEXT = mamba
@@ -37,25 +39,22 @@ datadir = ${prefix}/share
 initrddir = ${sysconfdir}/rc.d/init.d
 mandir = ${prefix}/usr/share/man
 sysconfigdir= ${sysconfdir}/sysconfig
+xprofiledir = ${sysconfdir}/xprofile.d
 mambabasedatadir = ${datadir}/openmamba/mambabase
 mambareportdatadir = ${datadir}/openmamba/mambareport
 mambawelcomedatadir = ${datadir}/openmamba/mambawelcome
 mambaimagesdir = ${datadir}/openmamba/images
 xramdrdatadir = ${datadir}/openmamba/xramdr
 bootrecoverdatadir = ${datadir}/openmamba/bootrecover
-usbinstalldatadir = ${datadir}/openmamba/usbinstall
 iconsdir = ${datadir}/icons/hicolor
 kdeprefixdir = $(shell kde-config --prefix)
-kde4prefixdir = $(shell kde4-config --prefix)
 kdedatadir = $(kdeprefixdir)/share
-kde4bindir = $(kde4prefixdir)/bin
 kdeautostartdir = ${kdedatadir}/autostart
 kdeconfigdir = ${kdedatadir}/config
 kdewallpapersdir = ${kdedatadir}/wallpapers
 localesdir = ${datadir}/locale
 kdelocalesdir = ${kdedatadir}/locale
-aptconfdir = ${sysconfdir}/apt/apt.conf.d
-aptscriptsdir = ${datadir}/apt/scripts
+pck_desktop = $(wildcard desktop/*.bz2)
 
 xdg_appsdir = ${datadir}/applications
 xdg_directorydir = ${datadir}/desktop-directories
@@ -65,7 +64,7 @@ xdg_mergedmenudir = $(xdg_menudir)/applications-merged
 distrorootdir = ${datadir}/$(DISTROid)
 distrobindir = ${distrorootdir}/bin
 distrosrpmsdir = ${distrorootdir}/SRPMS
-distrokdedir = ${distrorootdir}/kde
+distrodesktopdir = ${distrorootdir}/desktop
 srcdir = .
 
 INSTALL = /usr/bin/install
@@ -74,7 +73,6 @@ INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_DIR = ${INSTALL} -d -m 755
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-pck_kdedesktop = $(wildcard kde/desktop/*)
 #pck_srpms = flashplugin jre msttcorefonts win32codecs
 pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack
 
@@ -82,16 +80,17 @@ pck_infiles := $(wildcard kde/config/*.in \
                           kde/scripts/*.in \
                           kde/wallpapers/*.in \
                           menu/*.in menu/applications/*.in menu/applications/*/*.in \
-                          SRPMS/*/*.in)
+                          SRPMS/*/*.in \
+                          desktop/*.in)
 pck_sysconfigfile := distroutils.sysconfig
 
 distdir = $(PACKAGE)-$(VERSION)
 dist_archive = $(distdir).tar.bz2
 
+pck_desktop := $(wildcard desktop/*.tar.bz2)
 pck_catalogs := $(wildcard mambabase/po/*.po)
 pck_catalogs1 := $(wildcard mambawelcome/po/*.po)
 pck_catalogs2 := $(wildcard bootrecover/po/*.po)
-pck_catalogs3 := $(wildcard usbinstall/po/*.po)
 
 .SUFFIXES:
 .SUFFIXES: .in .po .mo
@@ -107,7 +106,7 @@ pck_catalogs3 := $(wildcard usbinstall/po/*.po)
             s,@datadir@,${datadir},g;\
             s,@bindir@,$(bindir),g;\
             s,@distrobindir@,$(distrobindir),g;\
-            s,@distrokdedir@,$(distrokdedir),g;\
+            s,@distrodesktopdir@,$(distrodesktopdir),g;\
             s,@distrosrpmsdir@,$(distrosrpmsdir),g;\
             s,@wallpaper@,$(DEFAULT_WALLPAPER),g;\
             s,@screensaver@,${SCREENSAVER},g;\
@@ -146,13 +145,6 @@ install-locales: locales
 	   $(INSTALL_DIR) $$dir;\
 	   $(INSTALL_DATA) $${f/.po/.mo} $$dir/bootrecover.mo;\
 	done
-	@for f in $(pck_catalogs3); do\
-	   lang=`echo $$f | sed 's,.*/\(.*\)\.po,\1,'`;\
-	   echo "installing i18n file for language \`$$lang'...";\
-	   dir="$(DESTDIR)$(localesdir)/$$lang/LC_MESSAGES";\
-	   $(INSTALL_DIR) $$dir;\
-	   $(INSTALL_DATA) $${f/.po/.mo} $$dir/usbinstall.mo;\
-	done
 
 install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)
@@ -160,16 +152,20 @@ install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(datadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(distrobindir)
-	@$(INSTALL_DIR) $(DESTDIR)$(kde4bindir)
+ifeq ($(WITHKDE3),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdedatadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeautostartdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(kdewallpapersdir)
+endif
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
 	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
+	cp -r etc/xprofile.d $(DESTDIR)$(sysconfdir)/
+	chmod 755 $(DESTDIR)$(sysconfdir)/xprofile.d/*.sh
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
 	cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
+ifeq ($(WITHKDE3),1)
 	cp -r kde/apps $(DESTDIR)$(kdedatadir)
 	$(INSTALL_DATA) kde/autostart/kmix.desktop $(DESTDIR)$(kdeautostartdir)/kmix.desktop
 	$(INSTALL_DATA) kde/config/*rc $(DESTDIR)$(kdeconfigdir)/
@@ -177,8 +173,8 @@ install-kde-distro-addons: dist-update
 	$(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kdeconfigdir)/kdeglobals
 	$(INSTALL_DATA) kde/wallpapers/$(WALLPAPER).desktop $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir)
+endif
 	$(INSTALL_DATA) kde/wallpapers/{$(COMPIZ_WALLPAPERS)} $(DESTDIR)$(mambaimagesdir)
-#	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
 
 install-distromenu: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(xdg_directorydir)
@@ -214,35 +210,48 @@ install-icons:
 	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
 	   $(INSTALL_DIR) $(DESTDIR)$(iconsdir)/$$i/apps/; \
 	   $(INSTALL_DATA) mambabase/mamba-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mamba.png; \
+	done
+ifeq ($(WITHKDE3TOOLS),1)
+	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
 	   $(INSTALL_DATA) mambawelcome/mambawelcome-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mambawelcome.png; \
-#	   $(INSTALL_DATA) xramdr/xramdr-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/xramdr.png; \
 	   $(INSTALL_DATA) bootrecover/bootrecover-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/bootrecover.png; \
 	done
+endif
+#	   $(INSTALL_DATA) xramdr/xramdr-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/xramdr.png \
 
 install-mambabase:
 	@$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir)
-	$(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_DATA) mambabase/mambabase.db $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_SCRIPT) mambabase/mambabase.sh $(DESTDIR)$(mambabasedatadir)
+ifeq ($(WITHKDE3TOOLS),1)
+	$(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_DATA) mambabase/mambabase.desktop $(DESTDIR)$(xdg_appsdir)
 	$(INSTALL_DATA) mambabase/mambabase-autostart.desktop $(DESTDIR)$(mambabasedatadir)
+endif
 
 install-mambareport:
+	$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
+ifeq ($(WITHKDE3TOOLS),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambareportdatadir)
 	$(INSTALL_SCRIPT) mambareport/mambareport.kmdr $(DESTDIR)$(mambareportdatadir)
-	$(INSTALL_SCRIPT) mambareport/openmamba-makereport $(DESTDIR)$(bindir)
 	$(INSTALL_DATA) mambareport/mambareport.desktop $(DESTDIR)$(xdg_appsdir)
+endif
 
 install-mambawelcome:
+ifeq ($(WITHKDE3TOOLS),1)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambawelcomedatadir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/rc.d/{init.d,rc5.d}
+	@$(INSTALL_DIR) $(DESTDIR)$(kdeconfigdir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome.kmdr $(DESTDIR)$(mambawelcomedatadir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome.sh $(DESTDIR)$(mambawelcomedatadir)
 	$(INSTALL_SCRIPT) mambawelcome/mambawelcome-init $(DESTDIR)$(sysconfdir)/rc.d/init.d/mambawelcome
 	$(INSTALL_DATA) gpl.html $(DESTDIR)$(mambawelcomedatadir)/gpl.html
 	$(INSTALL_DATA) gpl-it.html $(DESTDIR)$(mambawelcomedatadir)/gpl-it.html
 	$(INSTALL_DATA) gpl-es.html $(DESTDIR)$(mambawelcomedatadir)/gpl-es.html
+	$(INSTALL_DATA) kde/config/kcmfonts $(DESTDIR)$(kdeconfigdir)/kcmfonts
+	$(INSTALL_DATA) kde/config/kdeglobals $(DESTDIR)$(kdeconfigdir)/kdeglobals
 	ln -s ../init.d/mambawelcome $(DESTDIR)$(sysconfdir)/rc.d/rc5.d/S99mambawelcome
+endif
 
 install-xramdr:
 	@$(INSTALL_DIR) $(DESTDIR)$(xramdrdatadir)
@@ -251,20 +260,16 @@ install-xramdr:
 
 install-bootrecover:
 	@$(INSTALL_DIR) $(DESTDIR)$(bootrecoverdatadir)
-	$(INSTALL_SCRIPT) bootrecover/bootrecover.kmdr $(DESTDIR)$(bootrecoverdatadir)
 	$(INSTALL_SCRIPT) bootrecover/bootrecover.sh $(DESTDIR)$(bootrecoverdatadir)
+ifeq ($(WITHKDE3TOOLS),1)
+	$(INSTALL_SCRIPT) bootrecover/bootrecover.kmdr $(DESTDIR)$(bootrecoverdatadir)
 	$(INSTALL_DATA) bootrecover/openmamba-bootrecover.desktop $(DESTDIR)$(xdg_appsdir)
+endif
 
-install-apt-extras:
-	@$(INSTALL_DIR) $(DESTDIR)$(aptconfdir) $(DESTDIR)$(aptscriptsdir)
-	$(INSTALL_DATA) apt/post-install.conf $(DESTDIR)$(aptconfdir)
-	$(INSTALL_SCRIPT) apt/post-install.lua $(DESTDIR)$(aptscriptsdir)
-	$(INSTALL_SCRIPT) apt/post-install.sh $(DESTDIR)$(aptscriptsdir)
-
-install-usbinstall:
-	@$(INSTALL_DIR) $(DESTDIR)$(usbinstalldatadir)
-	$(INSTALL_SCRIPT) usbinstall/usbinstall.sh $(DESTDIR)$(usbinstalldatadir)
-	$(INSTALL_DATA) usbinstall/usbinstall.desktop $(DESTDIR)$(xdg_appsdir)
+install-desktop:
+	@$(INSTALL_DIR) $(DESTDIR)$(distrodesktopdir)
+	$(INSTALL_DATA) $(pck_desktop) $(DESTDIR)$(distrodesktopdir)
+	$(INSTALL_SCRIPT) desktop/desktop-firsttime.sh $(DESTDIR)$(xprofiledir)
 
 install-openmamba-update:
 	@$(INSTALL_DIR) $(DESTDIR)$(bindir)
@@ -275,15 +280,14 @@ install: $(pck_infiles:.in=) \
 	install-kde-distro-addons \
 	install-distromenu \
 	install-srpms \
+	install-desktop \
+	install-openmamba-update \
 	install-mambabase \
 	install-mambawelcome \
 	install-mambareport \
-	install-usbinstall \
-	install-openmamba-update \
 	install-bootrecover \
 	install-locales \
-	install-icons \
-	install-apt-extras
+	install-icons
 
 dist: clean
 	@git log > ChangeLog.git

SRPMS/flashplugin/distroutils.sysconfig

@@ -10,4 +10,4 @@ FLASH_PLUGIN_PCK=install_flash_player_11_linux.i386.tar.gz
 #FLASH_PLUGIN_URL=http://download.macromedia.com/pub/labs/flashplayer9_update/
 #FLASH_PLUGIN_URL=http://macromedia.rediris.es/rpmsource/
 #FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/current/
-FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/current/
+FLASH_PLUGIN_URL=http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHPLUGIN_VERSION}/

SRPMS/virtualbox-extension-pack/distroutils.sysconfig

@@ -1,7 +1,7 @@
 ## VirtualBox Extension Pack
 
 # package name (do not modify unless you know what you're doing)
-VIRTUALBOX_EXTENSION_PACK_PCK=Oracle_VM_VirtualBox_Extension_Pack-4.1.2-73507.vbox-extpack
+VIRTUALBOX_EXTENSION_PACK_PCK=Oracle_VM_VirtualBox_Extension_Pack-4.1.8.vbox-extpack
 
 # package URL (do not modify unless you know what you're doing)
-VIRTUALBOX_EXTENSION_PACK_URL=http://download.virtualbox.org/virtualbox/4.1.2/
+VIRTUALBOX_EXTENSION_PACK_URL=http://download.virtualbox.org/virtualbox/4.1.8/

SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in

@@ -46,13 +46,13 @@ cp %{S:0} LICENSE
 
 %post
 VBoxManage extpack uninstall Oracle_VM_VirtualBox_Extension_Pack || true
-VBoxManage extpack install /opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}-%{pck_minver}.vbox-extpack
+VBoxManage extpack install /opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack
 # --replace not working
 :
 
 %files
 %defattr(-,root,root)
-/opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}-%{pck_minver}.vbox-extpack
+/opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack
 %doc LICENSE
 
 %changelog

SRPMS/win32codecs/win32codecs.spec.in

@@ -82,7 +82,7 @@ rm -f $tmpfile
 curl --url $URL/$tarball -o $tarball || exit 1
 echo $tarball | sed 's/all-\([0-9]*\).tar.*/\1/' > VERSION_w32codecs
 
-tar xjf $tarball && rm -f $tarball
+tar xf $tarball --strip-components=1 && rm -f $tarball
 
 %build
 

SRPMSVERSIONS

@@ -1,4 +1,4 @@
-FLASHPLUGIN_VERSION=11.0.1.152
+FLASHPLUGIN_VERSION=11.1.102.62
 WIN32CODECS_VERSION=20110131
 SKYPE_VERSION=2.2.0.35
-VIRTUALBOX_EXTENSION_PACK_VERSION=4.1.2.73507
+VIRTUALBOX_EXTENSION_PACK_VERSION=4.1.8

VERSION

@@ -1 +1 @@
-VERSION = 2.2.34
+VERSION = 2.3.5

apt/post-install.conf

@@ -1,2 +0,0 @@
-Scripts::PM::Post:: "post-install.lua";
-Apt::Get::post-install "true";

apt/post-install.lua

@@ -1,12 +0,0 @@
--- This script will perform operations after new packages have been installed
---
--- Author: Silvan Calarco <silvan.calarco@qilinux.it> Copyright (c) 2009
---
-
--- Allow someone to disable this without removing the script.
-if confget("APT::Get::post-install/b", "true") == "false" then
-   return
-end
-
-os.execute("/usr/share/apt/scripts/post-install.sh")
-return

apt/post-install.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-[ -x /usr/bin/update-mime-database ] && update-mime-database /usr/share/mime >/dev/null
-IFS=":"
-for d in $XDG_DATA_DIRS; do
-   [ -x /usr/bin/update-desktop-database ] && update-desktop-database -q $d/applications/ >/dev/null
-done
-exit 0

bootrecover/bootrecover.kmdr

@@ -305,7 +305,7 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>Copyright (c) 2007-2010 by Silvan Calarco
+                    <string>Copyright (c) 2007-2011 by Silvan Calarco
 Released under the terms of the GNU GPL v3 license</string>
                 </property>
                 <property name="textFormat">
@@ -1115,7 +1115,7 @@ _EOF
 
 @if (@confirmBox.checked); then
    @dcop(@dcopid, KommanderIf, setEnabled(QString,bool), back, false)
-   @exec("sudo /usr/share/openmamba/bootrecover/bootrecover.sh -y @dcopid &amp;&gt; ~/.bootrecover.log")
+   @exec("sudo /usr/share/openmamba/bootrecover/bootrecover.sh ~/.bootrecover.conf @dcopid `whoami` &amp;&gt; ~/.bootrecover.log")
    @execBegin
       dcop @dcopid KommanderIf setText installlog "`cat ~/.bootrecover.log`"
    @execEnd

bootrecover/bootrecover.sh

@@ -3,11 +3,10 @@
 #
 # Released under the terms of the GNU GPLv3 License
 
-VERSION=0.6
+VERSION=0.7
 TEXTDOMAIN=bootrecover
 TEXTDOMAINDIR=/opt/kde3/share/locale/
 INSTALL_DATE=`date +%Y%m%d-%H%M`
-INPUT_FILE=~/.bootrecover.conf
 LOG_FILE=/var/log/bootrecover-$INSTALL_DATE.log
 MOUNTPOINT=/mnt/install
 KERNEL_RELEASE=`uname -r`
@@ -72,15 +71,23 @@ Installation time: $TIME_ELAPSED minutes"
    done
 }
 
-DCOPID=$2
+export PATH=$PATH:/sbin:/usr/sbin:/opt/kde3/bin
+
+INPUT_FILE=$1
+[ "$2" -a "$3" ] && DCOPID="--user $3 $2"
 
 echo $"\
 openmamba boot loader recovery script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 "
 
 dcop_write $"Starting installation..." 5
 
+[ $INPUT_FILE ] || {
+   echo $"Error: this script must be called by bootloader.kmdr; aborting." >&2
+   abort
+}
+
 [ -r $INPUT_FILE ] || {
    echo $"Error: cannot read input file $INPUT_FILE; aborting." >&2
    abort

bootrecover/openmamba-bootrecover.desktop

@@ -8,4 +8,4 @@ Exec=kmdr-executor /usr/share/openmamba/bootrecover/bootrecover.kmdr
 Icon=bootrecover
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;

bootrecover/po/es.po

@@ -44,9 +44,9 @@ msgstr ""
 
 #: _from_rc.cc:12
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
-msgstr "Copyright (c) 2007-2010 by Silvan Calarco\n"
+msgstr "Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Expedido según los terminos de la licencia GNU GPL v3"
 
 #: _from_rc.cc:9

bootrecover/po/it.po

@@ -44,9 +44,9 @@ msgstr ""
 
 #: _from_rc.cc:12
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
-msgstr "Copyright (c) 2007-2010 by Silvan Calarco\n"
+msgstr "Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Rilasciato secondo i termini della licenza GNU GPL v3"
 
 #: _from_rc.cc:9

desktop/desktop-firsttime.sh.in

@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# desktop.firsttime - Desktop firsttime script for @distroID@
+#
+# This file is called by startkde after the kpersonalizer has been
+# executed for first access configuration
+#
+# Copyright (c) 2005-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007 by Davide Madrisan <davide.madrisan@gmail.com>
+
+if [ ! -e $HOME/Desktop/.directory ]; then
+
+   case "$LANG" in
+      es*) LANG_ADD=es ;;
+      fr*) LANG_ADD=fr ;;
+      it*) LANG_ADD=it ;;
+      *) LANG_ADD=en ;;
+   esac
+
+   if [ -r @distrodesktopdir@/desktop-$LANG_ADD.tar.bz2 ]; then
+      mkdir -p $HOME/Desktop
+      ( cd $HOME/Desktop >/dev/null
+        tar xjf @distrodesktopdir@/desktop-common.tar.bz2
+        tar xjf @distrodesktopdir@/desktop-$LANG_ADD.tar.bz2 )
+   fi
+
+   touch $HOME/Desktop/.directory
+
+fi

etc/polkit-1/localauthority.conf.d/60-desktop-policy.conf

@@ -1,10 +0,0 @@
-# Configuration file for the PolicyKit Local Authority.
-#
-# DO NOT EDIT THIS FILE, it will be overwritten on update.
-#
-# See the pklocalauthority(8) man page for more information
-# about configuring the Local Authority.
-#
-
-[Configuration]
-AdminIdentities=unix-group:sysadmin

etc/xprofile.d/qt-graphicssystem.sh

@@ -0,0 +1 @@
+export QT_GRAPHICSSYSTEM=raster

kde/config/kwinrc

@@ -1,3 +1,6 @@
+[Compositing]
+DisableChecks=true
+
 [Windows]
 ElectricBorders=1
 ElectricBorderDelay=150

mambareport/openmamba-makereport

@@ -199,7 +199,7 @@ tailfile $HOME/.xsession-errors "desktop session log"
 # Audio
 catfile "/proc/asound/card*/codec*" "Audio driver codecs"
 catfile "/etc/asound.conf" "Alsa configuration"
-catfile "/etc/asound.state" "Alsa mixer settings"
+catfile "/var/lib/alsa/asound.state" "Alsa mixer settings"
 
 # Network
 catcommand "/sbin/ifconfig -a" "Network interfaces list"

usbinstall/po/it.po

@@ -1,85 +0,0 @@
-# Italian translation of openmamba-usbinstall.
-# Copyright (C) 2009 Ercole 'ercolinux' Carpanetto
-# This file is distributed under the same license as the openmamba-usbinstall package.
-# Ercole 'ercolinux' Carpanetto <ercole69@gmail.com>, 2009.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-01 23:12+0100\n"
-"PO-Revision-Date: 2009-12-01 23:12+0100\n"
-"Last-Translator: Ercole 'ercolinux' Carpanetto <ercole69@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: openmamba-usbinstall.sh:25
-msgid ""
-"Warning all the data on the usb key <b>${vendor[$chiave]} ${model[$chiave]}</"
-"b> with <b>${size[$chiave]} GB</b> will be destroyed!"
-msgstr ""
-"Attenzione tutti i dati sulla chiavetta <b>${vendor[$chiave]} ${model[$chiave]}</"
-"b> di <b>${size[$chiave]} GB</b> saranno cancellati!"
-
-#: openmamba-usbinstall.sh:27
-msgid "openmamba installation on USB device"
-msgstr "Installazione di openmamba su dispositivo USB"
-
-#: openmamba-usbinstall.sh:27
-msgid "Starting installation..."
-msgstr "Avvio dell'installazione..."
-
-#: openmamba-usbinstall.sh:32
-msgid "Creating partitions..."
-msgstr "Creazione delle partizioni..."
-
-#: openmamba-usbinstall.sh:51
-msgid "Formatting..."
-msgstr "Formattazione..."
-
-#: openmamba-usbinstall.sh:55
-msgid "Mounting and file creation..."
-msgstr "Montaggio e creazione files..."
-
-#: openmamba-usbinstall.sh:60
-msgid "Verifing files and eventually download from internet..."
-msgstr "Verifica dei files ed eventuale download da internet..."
-
-#: openmamba-usbinstall.sh:63
-msgid ""
-"Please select the 'bootusb' archive or press Cancel to download it"
-msgstr ""
-"Seleziona l'archivio 'bootusb' o premi Cancella per scaricarlo"
-
-#: openmamba-usbinstall.sh:66
-msgid "Please select the ISO image or press Cancel to download it"
-msgstr "Seleziona l'immagine ISO o premi Cancella per scaricarla"
-
-#: openmamba-usbinstall.sh:72
-msgid "Installing files..."
-msgstr "Installazione dei files..."
-
-#: openmamba-usbinstall.sh:76
-msgid "Installing bootloader..."
-msgstr "Installazione del bootloader..."
-
-#: openmamba-usbinstall.sh:79
-msgid "Copying ISO image..."
-msgstr "Copia immagine ISO..."
-
-#: openmamba-usbinstall.sh:116
-msgid "USB key missing"
-msgstr "Chiavetta USB non inserita"
-
-#: openmamba-usbinstall.sh:116
-msgid "Please insert a USB key or press No"
-msgstr "Per favore inserisci una chiavetta USB o premi No"
-
-#: openmamba-usbinstall.sh:128 openmamba-usbinstall.sh:131
-#: openmamba-usbinstall.sh:134
-msgid "Select the USB key on which you want to install openmamba"
-msgstr "Seleziona la chiavetta USB su cui installare openmamba"
-

usbinstall/usbinstall.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Name=openmamba USB installation
-Name[it]=Installazione di openmamba USB
-GenericName=Prepares an openmamba live system on a USB storage
-GenericName[it]=Prepara una chiavetta USB con openmamba live
-Exec=/usr/share/openmamba/usbinstall/usbinstall.sh
-Icon=mamba
-Terminal=0
-Type=Application
-Categories=X-openmamba;
-X-KDE-RootOnly=true
-X-KDE-SubstituteUID=true
-X-KDE-Username=root

usbinstall/usbinstall.sh

@@ -1,156 +0,0 @@
-#!/bin/bash
-# openmamba-usbinstall è uno script per la generazione automatica di una chiavetta di boot per openmamba snapshot.
-# Se i file necessari sono presenti sul disco fisso verranno utilizzati quelli altrimenti
-# scaricherà direttamente la versione attuale dal sito di openmamba.
-# se il file iso è presente nella home verrà usato direttamente altrimenti si aprirà un dialogo dove sarà possibile cercarlo.
-# (c) 2009 ercole 'ercolinux' carpanetto - ercole69@gmail.com
-# (c) 2009-2010 Silvan Calarco - silvan.calarco@mambasoft.it
-# rilasciato secondo la licenza GPL v.3
-
-# per cambiare la versione della snapshot di openmamba modificare il valore qui sotto di conseguenza
-version=20091201
-version_cd=20091201
-fileiso="~/openmamba-livecd-it-snapshot-"$version_cd".i586.iso"
-filecpio=""~/openmamba-bootusb-it-snapshot-"$version".i586.cpio.gz""
-
-#da qui in poi non c'è nulla da modificare
-
-TEXTDOMAIN=usbinstall
-TEXTDOMAINDIR=/usr/share/locale/
-
-function get_udisks_key() {
-   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
-}
-
-# formattazione della chiavetta e installazione dei file necessari al boot di openmamba
-installa(){
-conferma=0
-chiave=$c
-kdialog --title $"openmamba installation on USB device" --yesno $"Warning all the data on the usb key <b>${vendor[$chiave]} ${model[$chiave]}</b> with <b>${size[$chiave]} GB</b> will be destroyed!" && conferma=1
-
-if [ $conferma -eq 1 ]; then
-dcopRef=$(kdialog --geometry 450x140 --title $"openmamba installation on USB device" --progressbar $"Starting installation..." 12) 
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog maximum 20
-
-sudo umount ${device[$chiave]}1
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Creating partitions..."
-sudo fdisk ${device[$chiave]} <<EOF
-d
-4
-d
-3
-d
-2
-d
-n
-p
-1
-1
-
-a
-1
-w
-EOF
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 3
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Formattazione..."
-disk=${device[$chiave]}1
-sudo mkfs.ext3 $disk -L openmamba_live
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 6
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Mounting and file creation..."
-mkdir -p ~/tmpmamba
-sudo mount $disk ~/tmpmamba
-sudo chmod 777 ~/tmpmamba
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 10
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Verifing files and eventually download from internet..."
-file=$filecpio
-if [ ! -f $file ]; then
-file=$(kdialog --title $"Please select the 'bootusb' archive or press Cancel to download it" --getopenfilename $HOME "openmamba*-bootusb-*.cpio.gz |openmamba files")
-echo $file
-if [ ! $file ]; then
-file="~/openmamba-bootusb-it-snapshot-"$version".i586.cpio.gz"
-wget http://www.openmamba.org/pub/openmamba/devel/media/bootusb/it/openmamba-bootusb-it-snapshot-$version.i586.cpio.gz
-fi
-fi
-cd ~/tmpmamba
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 13
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Installing files..."
-gunzip -c < $file | cpio -i
-sudo extlinux --install boot
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 14
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Installing bootloader..."
-sudo install-mbr -e 1 ${device[$chiave]}
-qdbus $dcopRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 15
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.setLabelText $"Copying ISO image..."
-if [ ! -f $fileiso ];then
-fileiso=$(kdialog --title $"Please select the ISO image or press Cancel to download it" --getopenfilename $HOME "openmamba-*.iso |iso files")
-fi
-if [ ! $fileiso ];then
-sudo umount ~/tmpmamba
-cd
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.close
-exit 0
-fi
-cp $fileiso ./
-ln -fs `basename $fileiso` ./openmamba-live.iso
-cd ..
-sudo umount ~/tmpmamba
-fi
-qdbus $dcopRef org.kde.kdialog.ProgressDialog.close
-exit 0
-}
-
-scansione() {
-#ricerca di tutte le periferiche di archiviazione usb
-devices=`udisks --enumerate-device-files | grep -v /dev/disk | sort -n`
-c=0
-
-for dev in $devices; do
-   native_path=`get_udisks_key $dev native-path`
-   vend=`get_udisks_key $dev vendor`
-   prod=`get_udisks_key $dev model`
-   [ -e $native_path/partition ] && continue
-   is_system_internal=`get_udisks_key $dev "system internal"`
-   partition_scheme=`get_udisks_key $dev "scheme"`
-   if [ "$is_system_internal" != "1" -a "$partition_scheme" = "mbr" ]; then
-      c=$((c+1))
-      device[$c]=$dev
-      vendor[$c]=$vend
-      model[$c]=$prod
-      media_size[$c]=`get_udisks_key $dev size`
-      size[$c]=$((${media_size[$c]}/(1000*1000*1000)))
-    fi
-done
-if [ $c -eq 0 ]; then
-   t=$(kdialog --title $"USB key missing" --yesno $"Please insert a USB key or press No")
-   if [ ! $t ]; then
-      exit 0 
-   fi
-scansione
-fi
-}
-
-menu(){
-chiave=""
-if [ $c -gt 1 ]; then
-case $c in
-2)
-chiave=$(kdialog --radiolist $"Select the USB key on which you want to install openmamba" 1 "${vendor[1]} ${model[1]} ${size[1]} GB" 1 2 "${vendor[2]} ${model[2]} ${size[2]} GB" 2)
-;; 
-3)
-chiave=$(kdialog --radiolist $"Select the USB key on which you want to install openmamba" 1 "${vendor[1]} ${model[1]} ${size[1]} GB" 1 2 "${vendor[2]} ${model[2]} ${size[2]} GB" 2 3 "${vendor[3]} ${model[3]} ${size[3]} GB" 3)
-;;
-4)
-chiave=$(kdialog --radiolist $"Select the USB key on which you want to install openmamba" 1 "${vendor[1]} ${model[1]} ${size[1]} GB" 1 2 "${vendor[2]} ${model[2]} ${size[2]} GB" 2 3 "${vendor[3]} ${model[3]} ${size[3]} GB" 3 4 "${vendor[4]} ${model[4]} ${size[4]} GB" 4)
-;;
-esac
-if [ ! "$chiave" ]; then
- exit 0
-fi
-fi
-installa
-}
-
-scansione
-menu
-exit 0