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,24 +73,24 @@ 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
+pck_srpms = flashplugin msttcorefonts win32codecs skype b43-firmware virtualbox-extension-pack
 
 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,12 +106,13 @@ 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;\
             s,@flashpluginver@,${FLASHPLUGIN_VERSION},g;\
             s,@win32codecsver@,${WIN32CODECS_VERSION},g;\
+            s,@virtualboxextensionpackver@,${VIRTUALBOX_EXTENSION_PACK_VERSION},g;\
             s,@skypever@,${SKYPE_VERSION},g" $< > $@
 
 all: dist-update locales
@@ -145,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)
@@ -159,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)/
@@ -176,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)
@@ -213,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)
@@ -250,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)
@@ -274,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

@@ -4,10 +4,10 @@
 #FLASH_PLUGIN_PCK=flashplayer9_install_linux_082207.tar.gz
 #FLASH_PLUGIN_PCK=flash-player-plugin-9.0.48.0.tar.bz2
 #FLASH_PLUGIN_PCK=install_flash_player_9_linux.tar.gz
-FLASH_PLUGIN_PCK=install_flash_player_10_linux.tar.gz
+FLASH_PLUGIN_PCK=install_flash_player_11_linux.i386.tar.gz
 
 # package URL (do not modify unless you know what you're doing)
 #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/skype/skype.spec.in

@@ -38,15 +38,11 @@ tmpdir=$(mktemp -q -d -t skype.XXXXXXXX)
 
 wget -nv --timeout=10 --tries=2 \
    ${SKYPE_URL}${SKYPE_PCK} -P ${tmpdir}
-   
-SKYPE_ARCHIVE="`ls ${tmpdir}/skype-*`"
+
+SKYPE_ARCHIVE="`ls ${tmpdir}/*skype-* 2>/dev/null`"
 [ -f ${SKYPE_ARCHIVE} ] || exit 1
 
-if [ `echo ${SKYPE_ARCHIVE} | grep "tar.bz2$"` ]; then   
-   tar xjf ${SKYPE_ARCHIVE} --strip-components=1
-else
-   tar xzf ${SKYPE_ARCHIVE} --strip-components=1
-fi
+tar xf ${SKYPE_ARCHIVE} --strip-components=1
 
 %build -q
 

SRPMS/virtualbox-extension-pack/LICENSE

@@ -0,0 +1,34 @@
+VirtualBox PUEL terms and conditions
+License version 8, April 19, 2010
+
+ORACLE CORPORATION (“ORACLE”) IS WILLING TO LICENSE THE PRODUCT (AS DEFINED IN § 1 BELOW) TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS VIRTUALBOX PERSONAL USE AND EVALUATION LICENSE AGREEMENT (“AGREEMENT”). PLEASE READ THE AGREEMENT CAREFULLY. BY DOWNLOADING OR INSTALLING THIS PRODUCT, YOU ACCEPT THE FULL TERMS OF THIS AGREEMENT.
+
+IF YOU ARE AGREEING TO THIS LICENSE ON BEHALF OF AN ENTITY OTHER THAN AN INDIVIDUAL PERSON, YOU REPRESENT THAT YOU ARE BINDING AND HAVE THE RIGHT TO BIND THE ENTITY TO THE TERMS AND CONDITIONS OF THIS AGREEMENT.
+
+§ 1 Subject of Agreement. “Product”, as referred to in this Agreement, shall be the binary software package “Oracle VM VirtualBox,” which Product allows for creating multiple virtual computers, each with different operating systems (“Guest Computers”), on a physical computer with a specific operating system (“Host Computer”), to allow for installing and executing these Guest Computers simultaneously. The Product consists of executable files in machine code for the Solaris, Windows, Linux, and Mac OS X operating systems as well as other data files as required by the executable files at run-time and documentation in electronic form. The Product includes all documentation and updates provided to You by Oracle under this Agreement and the terms of this Agreement will apply to all such documentation and updates unless a different license is provided with an update or documentation.
+
+§ 2 Grant of license. (1) Oracle grants you a personal, non-exclusive, non-transferable, limited license without fees to reproduce, install, execute, and use internally the Product a Host Computer for your Personal Use, Educational Use, or Evaluation. “Personal Use” requires that you use the Product on the same Host Computer where you installed it yourself and that no more than one client connect to that Host Computer at a time for the purpose of displaying Guest Computers remotely. “Educational use” is any use in an academic institution (schools, colleges and universities, by teachers and students). “Evaluation” means testing the Product for a reasonable period (that is, normally for a few weeks); after expiry of that term, you are no longer permitted to evaluate the Product.
+
+(2) The “VirtualBox Guest Additions” are a set of drivers and utilities that are shipped as a subset of the Product for the purpose of being installed inside a Guest Computer to improve its performance and cooperation with the rest of the Product. In addition to and independent of the rights granted by subsection 1, Oracle allows you to install, execute, copy and redistribute a) unmodified copies of the ISO installation medium of the VirtualBox Guest Additions as shipped with the Product and b) the VirtualBox Guest Additions together with the Guest Computer into which they have been installed.
+
+§ 3 Restrictions and Reservation of Rights. (1) Any use beyond the provisions of § 2 is prohibited. The Product and copies thereof provided to you under this Agreement are copyrighted and licensed, not sold, to you by Oracle. Oracle reserves all copyrights and other intellectual property rights. This includes, but is not limited to, the right to modify, make available or public, rent out, lease, lend or otherwise distribute the Product. This does not apply as far as applicable law may require otherwise or if Oracle grants you additional rights of use in a separate agreement in writing.
+
+(2) You may not do any of the following: (a) modify the Product. However if the documentation accompanying Product lists specific portions of Product, such as header files, class libraries, reference source code, and/or redistributable files, that may be handled differently, you may do so only as provided in the documentation; (b) rent, lease, lend or encumber the Product; (c) remove or alter any proprietary legends or notices contained in the Product; or (d) decompile, or reverse engineer the Product (unless enforcement of this restrictions is prohibited by applicable law).
+
+(3) The Product is not designed, licensed or intended for use in the design, construction, operation or maintenance of any nuclear facility and Oracle and its licensors disclaim any express or implied warranty of fitness for such uses.
+
+(4) No right, title or interest in or to any trademark, service mark, logo or trade name of Oracle or its licensors is granted under this Agreement.
+
+§ 4 Termination. The Agreement is effective on the Date you receive the Product and remains effective until terminated. Your rights under this Agreement will terminate immediately without notice from Oracle if you materially breach it or take any action in derogation of Oracle's and/or its licensors' rights to Product. Oracle may terminate this Agreement should any Product become, or in Oracle's reasonable opinion likely to become, the subject of a claim of intellectual property infringement or trade secret misappropriation. Upon termination, you will cease use of, and destroy, Product and confirm compliance in writing to Oracle. Sections 3-9, inclusive, will survive termination of the Agreement.
+
+§ 5 Disclaimer of Warranty. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, ORACLE PROVIDES THE PRODUCT “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. The entire risk as to the quality and performance of the Product is with you. Should it prove defective, you assume the cost of all necessary servicing, repair, or correction. In addition, Oracle shall be allowed to provide updates to the Product in urgent cases. You are then obliged to install such updates. Such an urgent case includes, but is not limited to, a claim of rights to the Product by a third party.
+
+§ 6 Limitation of Liability. TO THE EXTENT NOT PROHIBITED BY APPLICABLE LAW, IN NO EVENT WILL ORACLE OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE PRODUCT, EVEN IF ORACLE HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no event will Oracle's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Product under this Agreement. Some states do not allow the exclusion of incidental or consequential damages, so some of the terms above may not be applicable to you.
+
+§ 7 Third Party Code. Portions of Product may be provided with notices and open source licenses from communities and third parties that govern the use of those portions, and any licenses granted hereunder do not alter any rights and obligations You may have under such open source licenses, however, the disclaimer of warranty and limitation of liability provisions in this Agreement will apply to all the Product.
+
+§ 8 Export Regulations. All Product, documents, technical data, and any other materials delivered under this Agreement are subject to U.S. export control laws and may be subject to export or import regulations in other countries. You agree to comply strictly with these laws and regulations and acknowledge that you have the responsibility to obtain any licenses to export, re-export, or import as may be required after delivery to you.
+
+§ 9 U.S. Government Restricted Rights. If Product is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Product and accompanying documentation will be only as set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions).
+
+§ 10 Miscellaneous. This Agreement is the entire agreement between you and Oracle relating to its subject matter. It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement. No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. Course of dealing and other standard business conditions of the parties or the industry shall not apply. This Agreement is governed by the substantive and procedural laws of California and you and Oracle agree to submit to the exclusive jurisdiction of, and venue in, the courts in San Francisco, San Mateo, or Santa Clara counties in California in any dispute arising out of or relating to this Agreement.

SRPMS/virtualbox-extension-pack/distroutils.sysconfig

@@ -0,0 +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.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.8/

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

@@ -0,0 +1,60 @@
+%define pck_majver %(echo %version | cut -d. -f1-3)
+%define pck_minver %(echo %version | cut -d. -f4)
+Name:          virtualbox-extension-pack
+Version:       @virtualboxextensionpackver@
+Release:       1@distroext@
+Epoch:         1
+Summary:       VirtualBox Extension Pack
+Group:         Applications/Emulators
+Vendor:        @vendor@
+Distribution:  @distribution@
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           http://www.virtualbox.org/
+Source:        LICENSE
+License:       Not Distributable
+Requires(post):VirtualBox
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+
+%description
+VirtualBox Extension Pack.
+
+%prep
+%setup -c -n %{name}-%{version} -T
+
+[ -r /etc/sysconfig/@sysconfigfile@ ] || exit 1
+. /etc/sysconfig/@sysconfigfile@
+
+[ "${VIRTUALBOX_EXTENSION_PACK_PCK}" ] || exit 1
+[ "${VIRTUALBOX_EXTENSION_PACK_URL}" ] || exit 1
+
+wget -nv --timeout=10 --tries=2 \
+   ${VIRTUALBOX_EXTENSION_PACK_URL}${VIRTUALBOX_EXTENSION_PACK_PCK} -O ${VIRTUALBOX_EXTENSION_PACK_PCK}
+
+[ -f ${VIRTUALBOX_EXTENSION_PACK_PCK} ] || exit 1
+
+%build
+
+%install
+[ "%{buildroot}" != / ] && rm -rf %{buildroot}
+. /etc/sysconfig/@sysconfigfile@
+
+install -D -m0644 ${VIRTUALBOX_EXTENSION_PACK_PCK} %{buildroot}/opt/VirtualBox/extension/${VIRTUALBOX_EXTENSION_PACK_PCK}
+cp %{S:0} LICENSE
+
+%clean
+[ "%{buildroot}" != / ] && rm -rf %{buildroot}
+
+%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:%pck_minver}.vbox-extpack
+# --replace not working
+:
+
+%files
+%defattr(-,root,root)
+/opt/VirtualBox/extension/Oracle_VM_VirtualBox_Extension_Pack-%{pck_majver}%{?pck_minver:%pck_minver}.vbox-extpack
+%doc LICENSE
+
+%changelog
+* Tue Aug 16 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 4.1.2.73507-1mamba
+- specfile created

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,3 +1,4 @@
-FLASHPLUGIN_VERSION=10.3.181.34
+FLASHPLUGIN_VERSION=11.1.102.62
 WIN32CODECS_VERSION=20110131
 SKYPE_VERSION=2.2.0.35
+VIRTUALBOX_EXTENSION_PACK_VERSION=4.1.8

VERSION

@@ -1,2 +1 @@
-VERSION = 2.2.26
-
+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">
@@ -426,128 +426,6 @@ This tool is also useful before the installation of a third party boot manager i
                 <set>AlignCenter</set>
             </property>
         </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>setlabel</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>540</x>
-                    <y>40</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="populationText">
-                <string></string>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@execBegin
-@if (@devicesbox.currentItem &gt;= 0)
-   currdev=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
-   @showdevice.setText(@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0))
-   @dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, true)
-   @BackBox.setChecked(true)
-
-   parent_udi=`hal-find-by-property  --key block.device --string /dev/$currdev`
-   #
-   # set MBR combo box
-   #
-   dcop @dcopid KommanderIf "clear(QString)" mbrbox
-   storages=`hal-find-by-capability --capability storage`
-   dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "$currdev (@i18n("System partition"))" 0
-   for udi in $storages; do
-      device=`hal-get-property --udi $udi --key block.device`
-      hotpluggable=`hal-get-property --udi $udi --key storage.hotpluggable` || hotpluggable="false"
-      partscheme=`hal-get-property --udi $udi --key storage.partitioning_scheme`
-      if [ "$partscheme" == "mbr" -a "$hotpluggable" != "true" ]; then
-         dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "${device:5:5} (master boot record)" 0
-      fi
-   done
-   dcop @dcopid KommanderIf "setCurrentItem(int)" 0
-@endif
-@execEnd
-@setBootableCheckbox.execute()</string>
-                </stringlist>
-            </property>
-        </widget>
-        <widget class="ScriptObject">
-            <property name="name">
-                <cstring>scanDevices</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>540</x>
-                    <y>0</y>
-                    <width>32</width>
-                    <height>32</height>
-                </rect>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string>@devicesbox.clear
-@BackBox.setChecked(false)
-@NextBox.setChecked(false)
-@execBegin
-volumes=`hal-find-by-capability --capability volume`
-partlabel=
-
-for udi in $volumes; do
-   device=`hal-get-property --udi $udi --key block.device`
-   parent_udi=`hal-get-property --udi $udi --key block.storage_device`
-   hotpluggable=`hal-get-property --udi $parent_udi --key storage.hotpluggable` || hotpluggable="false"
-   blocksize=`hal-get-property --udi $udi --key volume.block_size`
-   numblocks=`hal-get-property --udi $udi --key volume.num_blocks`
-   volsize=`expr $blocksize \* $numblocks / 1024 / 1024`
-   volname=`hal-get-property --udi $udi --key volume.label`
-   [ "$volname" ] || volname="unnamed"
-   parttype=`hal-get-property --udi $udi --key volume.partition.type`
-   [ "$parttype" ] || parttype="unknown"
-   partscheme=`hal-get-property --udi $udi --key volume.partition.scheme`
-   [ "$partscheme" ] || partscheme="unknown"
-   fstype=`hal-get-property --udi $udi --key volume.fstype`
-   [ "$fstype" ] || fstype="unformatted"
-   is_mounted=`hal-get-property --udi $udi --key volume.is_mounted`
-   [ "$is_mounted" = "true" ] || {
-      mkdir /mnt/${device:5:5} &amp;&amp; mount $device /mnt/${device:5:5}
-   }
-   mount_point=`hal-get-property --udi $udi --key volume.mount_point`
-   add_info=""
-   [ "$hotpluggable" = "true" ] &amp;&amp; {
-      add_info=",removable"
-      [ @removablebox.checked == 1 ] || continue
-   }
-   if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
-      partlabel="$partlabel&lt;br&gt;${device:5:5} $fstype $volname $volsize MB"
-      case "$parttype" in
-         0x82) ;;
-         0x83)
-            [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
-               release=`cat $mount_point/etc/openmamba-release`
-               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point ($fstype,$volname,$volsize MB${add_info})" 0
-            }
-            ;;
-         *) ;;
-      esac
-   elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
-      case "$fstype" in
-         swap|iso9660) ;;
-         ext2|ext3|reiserfs|unformatted)
-           [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
-               release=`cat $mount_point/etc/openmamba-release`
-               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point $volsize MB ($release)" 0
-            }
-            ;;
-         *) ;;
-      esac
-   fi
-done
-@execEnd
-</string>
-                </stringlist>
-            </property>
-        </widget>
         <widget class="GroupBox">
             <property name="name">
                 <cstring>PartitionBox</cstring>
@@ -601,27 +479,6 @@ done
                     <set>WordBreak|AlignTop</set>
                 </property>
             </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>showdevice</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>230</x>
-                        <y>340</y>
-                        <width>280</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>Label3</cstring>
@@ -667,6 +524,158 @@ done
                     </stringlist>
                 </property>
             </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>showdevice</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>180</x>
+                        <y>340</y>
+                        <width>350</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string></string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>scanDevices</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>540</x>
+                    <y>0</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@devicesbox.clear
+@BackBox.setChecked(false)
+@NextBox.setChecked(false)
+@execBegin
+function get_udisks_key() {
+   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
+}
+devices=`udisks --enumerate-device-files | grep -v /dev/disk | sort -n -r`
+partlabel=
+
+for device in $devices; do
+   native_path=`get_udisks_key $device native-path`
+   [ -e $native_path/partition ] || continue
+   is_system_internal=`get_udisks_key $device "system internal"`
+   volsize=`get_udisks_key $device size`
+   volsize=`expr $volsize / 1024 / 1024`
+   volname=`get_udisks_key $device label`
+   [ "$volname" ] || volname="unnamed"
+   parttype=`get_udisks_key $device usage`
+   [ "$parttype" ] || parttype="unknown"
+   partscheme=`get_udisks_key $device scheme`
+   [ "$partscheme" ] || partscheme="unknown"
+   fstype=`get_udisks_key $device type`
+   [ "$fstype" ] || fstype="unformatted"
+   add_info=""
+   is_mounted=`get_udisks_key $device "is mounted"`
+   [ "$is_mounted" = "1" ] || {
+      mkdir /mnt/${device:5:5} &amp;&amp; mount $device /mnt/${device:5:5}
+   }
+   mount_point=`get_udisks_key $device "mount paths"`
+   add_info=""
+   [ "$is_system_internal" == "1" ] || {
+      add_info=",removable"
+      [ @removablebox.checked == 1 ] || continue
+   }
+
+   if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
+      partlabel="$partlabel&lt;br&gt;${device:5:5} $fstype $volname $volsize MB"
+      case "$fstype" in
+         ext2|ext3|ext4|reiserfs|reiser4)
+            [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
+               release=`cat $mount_point/etc/openmamba-release`
+               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point ($fstype,$volname,$volsize MB${add_info})" 0
+            }
+            ;;
+         *) ;;
+      esac
+   elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
+      case "$fstype" in
+         swap|iso9660) ;;
+         ext2|ext3|ext4|reiserfs|reiser4)
+           [ "$mount_point" -a -e $mount_point/etc/openmamba-release ] &amp;&amp; {
+               release=`cat $mount_point/etc/openmamba-release`
+               dcop @dcopid KommanderIf "addListItem(QString,QString,int)" devicesbox "${device:5:5} $mount_point $volsize MB ($release)" 0
+            }
+            ;;
+         *) ;;
+      esac
+   fi
+done
+@execEnd
+</string>
+                </stringlist>
+            </property>
+        </widget>
+        <widget class="ScriptObject">
+            <property name="name">
+                <cstring>setlabel</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>540</x>
+                    <y>40</y>
+                    <width>32</width>
+                    <height>32</height>
+                </rect>
+            </property>
+            <property name="populationText">
+                <string></string>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string>@execBegin
+function get_udisks_key() {
+   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
+}
+@if (@devicesbox.currentItem &gt;= 0)
+   currdev=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
+   @showdevice.setText(@devicesbox.item(@devicesbox.currentItem))
+   @dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, true)
+   @BackBox.setChecked(true)
+
+   #
+   # set MBR combo box
+   #
+   dcop @dcopid KommanderIf "clear(QString)" mbrbox
+   devices=`udisks --enumerate-device-files | grep -v /dev/disk`
+   dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "$currdev (@i18n("System partition"))" 0
+
+   for device in $devices; do
+      native_path=`get_udisks_key $device native-path`
+      [ -e $native_path/partition ] &amp;&amp; continue
+      is_system_internal=`get_udisks_key $device "system internal"`
+      partscheme=`get_udisks_key $device scheme`
+      if [ "$is_system_internal" == "1" -o "@removablebox.checked" == "1" ]; then
+         [ "$partscheme" == "mbr" ] &amp;&amp; \
+            dcop @dcopid KommanderIf "addListItem(QString,QString,int)" mbrbox "${device:5:5} (master boot record)" 0
+      fi
+   done
+   dcop @dcopid KommanderIf "setCurrentItem(int)" 0
+@endif
+@execEnd
+@setBootableCheckbox.execute()
+</string>
+                </stringlist>
+            </property>
         </widget>
     </widget>
     <widget class="QWidget">
@@ -837,41 +846,6 @@ done
                     <set>WordBreak|AlignTop</set>
                 </property>
             </widget>
-            <widget class="ScriptObject">
-                <property name="name">
-                    <cstring>setBootableCheckbox</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>false</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>520</x>
-                        <y>70</y>
-                        <width>32</width>
-                        <height>32</height>
-                    </rect>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string>@execBegin
-mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
-mbrpart=${mbrdevice:3:2}
-if [ "$mbrpart" ]; then
-   if [ $mbrpart -le 4 ]; then
-      dcop @dcopid KommanderIf setEnabled bootableBox true
-   else
-      dcop @dcopid KommanderIf setEnabled bootableBox false
-      dcop @dcopid KommanderIf setChecked bootableBox false
-   fi
-else
-   dcop @dcopid KommanderIf setEnabled bootableBox false
-fi
-@execEnd
-</string>
-                    </stringlist>
-                </property>
-            </widget>
             <widget class="ListBox">
                 <property name="name">
                     <cstring>chainloadbox</cstring>
@@ -907,6 +881,41 @@ fi
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
+            <widget class="ScriptObject">
+                <property name="name">
+                    <cstring>setBootableCheckbox</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>false</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>520</x>
+                        <y>70</y>
+                        <width>32</width>
+                        <height>32</height>
+                    </rect>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string>@execBegin
+mbrdevice=@String.section(@mbrbox.item(@mbrbox.currentItem)," ",0)
+mbrpart=${mbrdevice:3:2}
+if [ "$mbrpart" ]; then
+   if [ $mbrpart -le 4 ]; then
+      dcop @dcopid KommanderIf setEnabled bootableBox true
+   else
+      dcop @dcopid KommanderIf setEnabled bootableBox false
+      dcop @dcopid KommanderIf setChecked bootableBox false
+   fi
+else
+   dcop @dcopid KommanderIf setEnabled bootableBox false
+fi
+@execEnd
+</string>
+                    </stringlist>
+                </property>
+            </widget>
         </widget>
         <widget class="ScriptObject">
             <property name="name">
@@ -927,38 +936,39 @@ fi
 @chainloadbox.clear
 @setBootableCheckbox.execute()
 @execBegin
+function get_udisks_key() {
+   LANG=C udisks --show-info $1 | grep " $2:" | head -n1 | sed "s|[[:space:]]*$2:[[:space:]]*\(.*\)|\1|"
+}
 installdevice=@String.section(@devicesbox.item(@devicesbox.currentItem)," ",0)
-volumes=`hal-find-by-capability --capability volume`
+devices=`udisks --enumerate-device-files | grep -v /dev/disk | sort -n -r`
 partlabel=
 
-for udi in $volumes; do
-   device=`hal-get-property --udi $udi --key block.device`
-   [ "${device:5:5}" = "$installdevice" ] &amp;&amp; continue
-   parent_udi=`hal-get-property --udi $udi --key block.storage_device`
-   hotpluggable=`hal-get-property --udi $parent_udi --key storage.hotpluggable` || hotpluggable="false"
-   blocksize=`hal-get-property --udi $udi --key volume.block_size`
-   numblocks=`hal-get-property --udi $udi --key volume.num_blocks`
-   volsize=`expr $blocksize \* $numblocks / 1024 / 1024`
+for device in $devices; do
+   native_path=`get_udisks_key $device native-path`
+   [ -e $native_path/partition ] || continue
+   is_system_internal=`get_udisks_key $device "system internal"`
+   volsize=`get_udisks_key $device size`
+   volsize=`expr $volsize / 1024 / 1024`
    [ $volsize = 0 ] &amp;&amp; continue
-   volname=`hal-get-property --udi $udi --key volume.label`
-   mount_point=`hal-get-property --udi $udi --key volume.mount_point`
+   volname=`get_udisks_key $device label`
    [ "$volname" ] || volname="unnamed"
-   parttype=`hal-get-property --udi $udi --key volume.partition.type`
+   parttype=`get_udisks_key $device usage`
    [ "$parttype" ] || parttype="unknown"
-   partscheme=`hal-get-property --udi $udi --key volume.partition.scheme`
+   partscheme=`get_udisks_key $device scheme`
    [ "$partscheme" ] || partscheme="unknown"
-   fstype=`hal-get-property --udi $udi --key volume.fstype`
+   fstype=`get_udisks_key $device type`
    [ "$fstype" ] || fstype="unformatted"
    add_info=""
-   [ "$hotpluggable" = "true" ] &amp;&amp; {
+   [ "$is_system_internal" = "1" ] || {
       add_info=",removable"
       [ @removablebox.checked == 1 ] || continue
    }
+
    if [ "$partscheme" == "mbr" -o "$partscheme" == "embr" ]; then
       partlabel="$partlabel&lt;br&gt;${device:5:5} $fstype $volname $volsize MB"
-      case "$parttype" in
-         0x82) ;;
-         0x83) ;;
+      case "$fstype" in
+         swap|iso9660|unformatted) ;;
+         ext2|ext3|ext4|reiserfs|reiser4|unformatted) ;;
          *) dcop @dcopid KommanderIf "addListItem(QString,QString,int)" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})" 0
 	    dcop @dcopid KommanderIf "setSelection" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})"
          ;;
@@ -966,7 +976,7 @@ for udi in $volumes; do
    elif [ "$partscheme" == "gpt" -o "$partscheme" == "unknown" -a $volsize -gt 0 ]; then
       case "$fstype" in
          swap|iso9660|unformatted) ;;
-         ext2|ext3|reiserfs) ;;
+         ext2|ext3|ext4|reiserfs|reiser4) ;;
          *) dcop @dcopid KommanderIf "addListItem(QString,QString,int)" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})" 0
 	    dcop @dcopid KommanderIf "setSelection" chainloadbox "${device:5:5} ($fstype,$volname,$volsize MB${add_info})"
          ;;
@@ -1025,6 +1035,33 @@ done
                 <set>AlignCenter</set>
             </property>
         </widget>
+        <widget class="TextEdit">
+            <property name="name">
+                <cstring>installlog</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>20</x>
+                    <y>60</y>
+                    <width>540</width>
+                    <height>360</height>
+                </rect>
+            </property>
+            <property name="hScrollBarMode">
+                <enum>AlwaysOn</enum>
+            </property>
+            <property name="textFormat">
+                <enum>LogText</enum>
+            </property>
+            <property name="populationText">
+                <string></string>
+            </property>
+            <property name="associations" stdset="0">
+                <stringlist>
+                    <string></string>
+                </stringlist>
+            </property>
+        </widget>
         <widget class="ScriptObject">
             <property name="name">
                 <cstring>launchinstall</cstring>
@@ -1078,7 +1115,7 @@ _EOF
 
 @if (@confirmBox.checked); then
    @dcop(@dcopid, KommanderIf, setEnabled(QString,bool), back, false)
-   @exec("/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
@@ -1113,33 +1150,6 @@ _EOF
                 </stringlist>
             </property>
         </widget>
-        <widget class="TextEdit">
-            <property name="name">
-                <cstring>installlog</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>20</x>
-                    <y>60</y>
-                    <width>540</width>
-                    <height>360</height>
-                </rect>
-            </property>
-            <property name="hScrollBarMode">
-                <enum>AlwaysOn</enum>
-            </property>
-            <property name="textFormat">
-                <enum>LogText</enum>
-            </property>
-            <property name="populationText">
-                <string></string>
-            </property>
-            <property name="associations" stdset="0">
-                <stringlist>
-                    <string></string>
-                </stringlist>
-            </property>
-        </widget>
     </widget>
 </widget>
 <images>

bootrecover/bootrecover.sh

@@ -1,13 +1,12 @@
 # openmamba boot loader recovery script
-# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # 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,70 +71,23 @@ Installation time: $TIME_ELAPSED minutes"
    done
 }
 
-function find_driver_for_udi() {
-   local found_driver parent_udi
+export PATH=$PATH:/sbin:/usr/sbin:/opt/kde3/bin
 
-   parent_udi=$1
-   while [ ! "$found_driver" -a "$parent_udi" != "/org/freedesktop/Hal/devices/computer" ]; do
-      parent_udi=`hal-get-property --udi $parent_udi --key info.parent 2>/dev/null`
-      [ "`hal-get-property --udi $parent_udi --key info.bus 2>/dev/null`" = "pci" ] &&
-         found_driver=`hal-get-property --udi $parent_udi --key info.linux.driver 2>/dev/null`
-   done
-   if [ "$found_driver" ]; then
-      echo $found_driver
-      return 0
-   else
-      return 1
-   fi
-}
-
-function find_remapped_device() {
-
-   local REMAPPED_INSTALL_DEVICE
-
-   tempfile=`tempfile 2>/dev/null`
-   mapfile=`tempfile 2>/dev/null`
-
-   # generate current volumes sorted list with driver information
-   storages=`hal-find-by-capability --capability storage`
-   for s in $storages; do
-      device=`hal-get-property --udi $s --key block.device`
-      linux_driver=`find_driver_for_udi $s`
-      [ "${device:5:2}" = "sd" ] && \
-         echo "${device:0:8} $linux_driver" >> $tempfile
-   done
-   # sort
-   cat $tempfile|sort > $mapfile
-   rm -f $tempfile
-
-   LETTERS=(a b c d e f g h i j k l m n o p q r s t u v w x y z)
-
-   CURR_DRIVE_LETTER=0
-   while read line; do
-      set -- $line
-      [ "$1" = "$INSTALL_DISK_DEVICE" ] && REMAPPED_INSTALL_DEVICE="${INSTALL_DEVICE:0:7}${LETTERS[CURR_DRIVE_LETTER]}${INSTALL_DEVICE:8:2}"
-      [ "$2" = "$INSTALL_DRIVER" ] && {
-         DEV_NAME_ORIG=(${DEV_NAME_ORIG[*]} $1)
-         DEV_NAME_DEST=(${DEV_NAME_DEST[*]} ${1:0:7}${LETTERS[CURR_DRIVE_LETTER]})
-         let CURR_DRIVE_LETTER+=1
-      }
-   done < $mapfile
-   [ "$REMAPPED_INSTALL_DEVICE" ] || REMAPPED_INSTALL_DEVICE=$INSTALL_DEVICE
-   echo $REMAPPED_INSTALL_DEVICE
-
-   rm -f $mapfile
-   rm -f $tmpfile
-}
-
-DCOPID=$2
+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
@@ -166,9 +118,6 @@ MOUNTPOINT=$INSTALL_MOUNTPOINT
    abort
 }
 
-REMAPPED_INSTALL_DEVICE=`find_remapped_device $INSTALL_DEVICE`
-echo $"Install device $INSTALL_DEVICE will be known as $REMAPPED_INSTALL_DEVICE in the installed system" | tee -a $LOG_FILE
-
 dcop_write $"Binding system dirs to new mountpoint..." 73
 mount -o bind /dev $MOUNTPOINT/dev || {
    echo $"Error: could not mount $MOUNTPOINT/dev; aborting." >&2
@@ -246,10 +195,6 @@ _EOF
    }
 
    chroot $MOUNTPOINT update-grub | tee -a $LOGFILE
-
-   [ "${INSTALL_DEVICE}" != "${REMAPPED_INSTALL_DEVICE}" ] && \
-      sed -i "s|root=/dev/${INSTALL_DEVICE:5:5}|root=/dev/${REMAPPED_INSTALL_DEVICE:5:5}|" \
-             $MOUNTPOINT/boot/grub/grub.cfg
 else
    echo $"Info: skipping bootloader installation" | tee -a $LOG_FILE
 fi

bootrecover/openmamba-bootrecover.desktop

@@ -8,7 +8,4 @@ Exec=kmdr-executor /usr/share/openmamba/bootrecover/bootrecover.kmdr
 Icon=bootrecover
 Terminal=0
 Type=Application
-Categories=X-openmamba
-X-KDE-RootOnly=true
-X-KDE-SubstituteUID=true
-X-KDE-Username=root
+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/polkit-1/localauthority/10-vendor.d/60-desktop-policy.pkla

@@ -12,3 +12,24 @@ Action=org.freedesktop.packagekit.*
 ResultAny=yes
 ResultInactive=no
 ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=org.kde.ufw.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=gufw.daemon.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes

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

mambabase/mambabase-autostart.desktop

@@ -7,7 +7,7 @@ Exec=kmdr-executor /usr/share/openmamba/mambabase/mambabase.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root

mambabase/mambabase.desktop

@@ -7,7 +7,7 @@ Exec=kmdr-executor /usr/share/openmamba/mambabase/mambabase.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root

mambabase/mambabase.sh

@@ -92,17 +92,15 @@ if [ "$INSTALL_BASE" = "1" ]; then
    dcop_write $"Removing packages that are no longer needed..." 10
    rpm -q msysklogd >/dev/null && apt_get_parsed remove -y msysklogd
 
-   # first time: remove mamba from user autostart
-   [ -e /home/$USER/.kde/Autostart/mambabase.desktop ] && {
-      rm -f /home/$USER/.kde/Autostart/mambabase.desktop
-      [ -e /home/$USER/.kde/share/config/ktiprc ] && \
-         rm -f /home/$USER/.kde/share/config/ktiprc
-   }
-   [ -e /home/$USER/.kde4/Autostart/mambabase.desktop ] && \
-      rm -f /home/$USER/.kde4/Autostart/mambabase.desktop
-
    dcop_write $"Installing/updating openmamba base packages..." 15
    rpm -q --whatprovides $BASE_PKGS >/dev/null || apt_get_parsed install -y $BASE_PKGS
+
+   # first time: remove mambabase from autostart
+   [ -e /home/$USER/.kde4/Autostart/mambabase.desktop ] && \
+      rm -f /home/$USER/.kde4/Autostart/mambabase.desktop
+   # ugly workaround: don't have permissions to rm file in /etc/xdg/autostart
+   [ -e /etc/xdg/autostart/mambabase.desktop ] && \
+      > /etc/xdg/autostart/mambabase.desktop
 fi
 
 if [ "$INSTALL_UPDATE" = "1" ]; then

mambabase/po/es.po

@@ -102,7 +102,7 @@ msgstr ""
 
 #: _from_rc.cc:17
 msgid "openmamba installation/updates"
-msgstr "instalación/actualización de openmamba"
+msgstr "Instalación/actualización de openmamba"
 
 #: _from_rc.cc:18
 msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)"

mambabase/po/it.po

@@ -102,7 +102,7 @@ msgstr ""
 
 #: _from_rc.cc:17
 msgid "openmamba installation/updates"
-msgstr "installazioni/aggiornamenti di openmamba"
+msgstr "Installazioni/aggiornamenti di openmamba"
 
 #: _from_rc.cc:18
 msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)"

mambareport/mambareport.desktop

@@ -7,7 +7,7 @@ Exec=kmdr-executor /usr/share/openmamba/mambareport/mambareport.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root

mambareport/openmamba-makereport

@@ -50,7 +50,7 @@ function catfile() {
 
    FILENAME=$1
    FILEDESC=$2
-   
+
    for c in $FILENAME; do 
       cat >> $TEMPFILE << _EOF
 
@@ -68,25 +68,16 @@ function tailfile() {
 
    FILENAME=$1
    FILEDESC=$2
-   
-   for c in $1; do 
+
+   for c in $1; do
       cat >> $TEMPFILE << _EOF
 
 ****************************************************************
-* File '$c' (first lines): $FILEDESC
+* File '$c' (last 200 lines): $FILEDESC
 ****************************************************************
 _EOF
 
-      head -n 100 ${ROOT}/$c >> $TEMPFILE
-
-      cat >> $TEMPFILE << _EOF
-      
-****************************************************************
-* File '$c' (last lines): $FILEDESC
-****************************************************************
-_EOF
-
-      tail -n 100 ${ROOT}/$c >> $TEMPFILE
+      tail -n 200 ${ROOT}/$c >> $TEMPFILE
    done
 
 }
@@ -169,7 +160,7 @@ catfile /etc/openmamba-release "release information"
 catfile /etc/sysconfig/machine "machine information from BIOS"
 catfile /proc/cpuinfo "processor(s) information"
 catfile /proc/meminfo "System memory information"
-catcommand /usr/sbin/lspci -nn "PCI hardware information (short)"
+catcommand "/usr/sbin/lspci -nn" "PCI hardware information (short)"
 catcommand /usr/sbin/lsusb "USB hardware information"
 catcommand /sbin/lsmod "Loadel kernel modules"
 catcommand "rpm -qa|grep kernel-mamba" "Installed kernel packages"
@@ -185,14 +176,20 @@ catfile /proc/cmdline "kernel startup command line"
 catcommand "ls -l /boot" "boot files"
 catfile /boot/grub/grub.cfg "GRUB configuration"
 catfile /var/log/dmesg.log "kernel startup messages"
+catcommand /bin/dmesg "last kernel messages"
 catfile "/etc/modprobe.d/*" "modules configuration"
 catcommand "/usr/sbin/lsinitrd /boot/initramfs-`uname -r`.img" "running kernel initial ramdisk"
 
 # system boot problems
 catfile /var/log/initd.sysinit.start "system init logfile"
-catfile /var/log/initd.*.start "runlevel init logfile"
+catfile "/var/log/initd.3.start" "runlevel 3 init logfile"
+catfile "/var/log/initd.5.start" "runlevel 5 init logfile"
 catfile /var/log/postplug.log "system configuration tool"
 
+# Suspend/Powersave
+catfile /var/log/pm-powersave.log "Current powersave logfile"
+catfile /var/log/pm-suspend.log "Last suspend logfile"
+
 # Graphical subsystem
 catfile /var/log/Xorg.0.log "Xorg startup log"
 catfile /etc/X11/xorg.conf "Xorg configuration"
@@ -202,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"
@@ -211,7 +208,13 @@ catcommand "/sbin/route -n" "Routing table"
 catfile "/etc/sysconfig/network" "General network configuration"
 catfile "/etc/resolv.conf" "DNS configuration"
 
+# Disks
+for d in /dev/sd[a-z]; do
+   catcommand "smartctl -ia $d" "S.M.A.R.T. status for device $d"
+done
+
 # Installation
+catcommand "rpm -qa --last | head -n 100" "Last installed packages"
 catfile "/var/log/install-*" "Installation log"
 catfile /var/log/Xorg.5.log "Xorg installation test log"
 

mambawelcome/mambawelcome-init

@@ -27,6 +27,7 @@ INPUT_FILE=/root/.installer.conf
 #/opt/kde3/bin/dcopserver
 xinit /opt/kde3/bin/kmdr-executor /usr/share/openmamba/mambawelcome/mambawelcome.kmdr -- -br -dpi 100
 #/opt/kde3/bin/dcopserver_shutdown
+killall -9 dcopserver
 
 [ -e /root/.mambawelcome-not-completed ] && {
    rm -f /root/.mambawelcome-not-completed

mambawelcome/mambawelcome.sh

@@ -115,9 +115,10 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
    #mkdir /home/$INSTALL_USER/Desktop
    chmod 711 /home/$INSTALL_USER
    #cp /usr/share/openmamba/installer/*.txt /home/$INSTALL_USER/Desktop/
-   mkdir -p /home/$INSTALL_USER/.kde4/Autostart
-   cp /usr/share/openmamba/mambabase/mambabase-autostart.desktop /home/$INSTALL_USER/.kde4/Autostart/mambabase.desktop
-   chmod 711 /home/$INSTALL_USER/.kde4/Autostart/mambabase.desktop
+
+   cp /usr/share/openmamba/mambabase/mambabase-autostart.desktop /etc/xdg/autostart/mambabase.desktop
+   chown $INSTALL_USER /etc/xdg/autostart/mambabase.desktop
+   chmod 644 /etc/xdg/autostart/mambabase.desktop
 
    # create home kde configuration directory
    mkdir -p /home/$INSTALL_USER/.kde4/share/config

menu/applications/logs/dmesg-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Messaggi del kernel durante l'avvio del sistema
 Comment[fr]=Messages du noyau lors du démarrage du système
 Exec=@distrobindir@/showlog /var/log/dmesg.log "Kernel init messages" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/runlevel-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Informazioni sull'avvio dei servizi di runlevel 5
 Comment[fr]=Messages au démarrage des services du runlevel 5
 Exec=@distrobindir@/showlog /var/log/initd.5.start "Runlevel 5 init log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/runlevel0-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Informazioni riguardo all'ultimo spegnimento del sistema
 Comment[fr]=Messages du système lors du dernier arrêt
 Exec=@distrobindir@/showlog /var/log/initd.0.stop "Last shutdown log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/runlevel6-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Informazioni riguardo all'ultimo riavvio del sistema
 Comment[fr]=Messages du système lors du dernier redémarrage
 Exec=@distrobindir@/showlog /var/log/initd.6.stop "Last reboot log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/logs/sysinit-log.desktop.in

@@ -11,4 +11,4 @@ Comment[it]=Messaggi di avvio del sistema openmamba
 Comment[fr]=Messages au démerrage du système openmamba
 Exec=@distrobindir@/showlog /var/log/initd.sysinit.start "System init log" agent
 Icon=utilities-log-viewer
-Categories=X-@distroID@-Logs
+Categories=X-@distroID@-Logs;

menu/applications/netinstall/virtualbox-extension-pack.desktop.in

@@ -0,0 +1,19 @@
+[Desktop Entry]
+Name=Install VirtualBox Extension Pack
+Name[es]=Instala el VirtualBox Extension Pack
+Name[fr]=Installation du VirtualBox Extension Pack
+Name[it]=Installa il VirtualBox Extension Pack
+Comment=Install VirtualBox Extension Pack from network
+Comment[es]=Instala el VirtualBox Extension Pack por red
+Comment[fr]=Installation du VirtualBox Extension Pack depuis le réseau
+Comment[it]=Installa il VirtualBox Extension Pack dalla rete
+Encoding=UTF-8
+Exec=@bindir@/openmamba-netsrpms virtualbox-extension-pack
+Icon=VBox
+MimeType=
+Path=
+StartupNotify=true
+Terminal=false
+TerminalOptions=
+Type=Application
+Categories=X-@distroID@-NetInstall;

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,149 +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/
-# 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() {
-#scansione di hal alla ricerca di tutte le periferiche di archiviazione usb
-c=0
-for udi in $(/usr/bin/hal-find-by-capability --capability storage)
-do
-    if [[ $(hal-get-property --udi $udi --key storage.removable) = "true" &&
-          $(hal-get-property --udi $udi --key storage.drive_type) = "disk" ]]; then
-	c=$((c+1))
-        device[$c]=$(hal-get-property --udi $udi --key block.device)
-        vendor[$c]=$(hal-get-property --udi $udi --key storage.vendor)
-        model[$c]=$(hal-get-property --udi $udi --key storage.model)
-	parent_udi=$(hal-find-by-property --key block.storage_device --string $udi)
-#        mount[$c]=$(hal-get-property --udi $parent_udi --key volume.mount_point)
-#        label[$c]=$(hal-get-property --udi $parent_udi --key volume.label)
-        media_size[$c]=$(hal-get-property --udi $udi --key storage.removable.media_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

xramdr/xramdr.desktop

@@ -6,7 +6,7 @@ Exec=kmdr-executor /usr/share/openmamba/xramdr/xramdr.kmdr
 Icon=mamba
 Terminal=0
 Type=Application
-Categories=X-openmamba
+Categories=X-openmamba;
 #X-KDE-RootOnly=true
 #X-KDE-SubstituteUID=true
 #X-KDE-Username=root