Merge remote branch 'nutyx-2009/master'

8 files changed, 58 insertions, 20 deletions

diff --git a/extra/gestpkg-module/Pkgfile b/extra/gestpkg-module/Pkgfile
index f55fd2c47..0b9ac0bae 100644
--- a/extra/gestpkg-module/Pkgfile
+++ b/extra/gestpkg-module/Pkgfile
@@ -3,10 +3,11 @@
 # Maintainer: NuTyX core team
 # Packager: ferarduansednan at laposte dot net
 # Depends on: python
+
 name=gestpkg-module
 version=1.1
 release=1
-source=(http://saintux.free.fr/depot/logiciels/sources/$name-$version-src./tar.gz)
+source=(http://kiao.no-ip.info/NuTyX/files/$name-$version-src.tar.gz)
 
 build() {
 cd ./$name-$version-src
diff --git a/extra/gestpkg/Pkgfile b/extra/gestpkg/Pkgfile
index 8bc8f3639..2077a26e7 100644
--- a/extra/gestpkg/Pkgfile
+++ b/extra/gestpkg/Pkgfile
@@ -6,7 +6,7 @@
 name=gestpkg
 version=1.1
 release=1
-source=(http://saintux.free.fr/depot/logiciels/sources/$name-$version-src.tar.gz)
+source=(http://kiao.no-ip.info/NuTyX/files/$name-$version-src.tar.gz)
 
 
 build() {
diff --git a/extra/opera/.footprint b/extra/opera/.footprint
index 04cea0c72..097024121 100644
--- a/extra/opera/.footprint
+++ b/extra/opera/.footprint
@@ -3,13 +3,13 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/opera
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/opera/
-drwxr-xr-x	root/root	usr/lib/opera/10.00/
--rw-r--r--	root/root	usr/lib/opera/10.00/missingsyms.so
--rwxr-xr-x	root/root	usr/lib/opera/10.00/opera
--rwxr-xr-x	root/root	usr/lib/opera/10.00/operaplugincleaner
--rwxr-xr-x	root/root	usr/lib/opera/10.00/operapluginwrapper
--rw-r--r--	root/root	usr/lib/opera/10.00/spellcheck.so
--rwxr-xr-x	root/root	usr/lib/opera/10.00/works
+drwxr-xr-x	root/root	usr/lib/opera/10.01/
+-rw-r--r--	root/root	usr/lib/opera/10.01/missingsyms.so
+-rwxr-xr-x	root/root	usr/lib/opera/10.01/opera
+-rwxr-xr-x	root/root	usr/lib/opera/10.01/operaplugincleaner
+-rwxr-xr-x	root/root	usr/lib/opera/10.01/operapluginwrapper
+-rw-r--r--	root/root	usr/lib/opera/10.01/spellcheck.so
+-rwxr-xr-x	root/root	usr/lib/opera/10.01/works
 drwxr-xr-x	root/root	usr/lib/opera/plugins/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
@@ -61,6 +61,9 @@ drwxr-xr-x	root/root	usr/share/opera/java/
 drwxr-xr-x	root/root	usr/share/opera/locale/
 drwxr-xr-x	root/root	usr/share/opera/locale/be/
 -rw-r--r--	root/root	usr/share/opera/locale/be/be.lng
+-rw-r--r--	root/root	usr/share/opera/locale/be/bookmarks.adr
+-rw-r--r--	root/root	usr/share/opera/locale/be/search.ini
+-rw-r--r--	root/root	usr/share/opera/locale/be/standard_speeddial.ini
 drwxr-xr-x	root/root	usr/share/opera/locale/bg/
 -rw-r--r--	root/root	usr/share/opera/locale/bg/bg.lng
 drwxr-xr-x	root/root	usr/share/opera/locale/cs/
@@ -76,7 +79,9 @@ drwxr-xr-x	root/root	usr/share/opera/locale/de/
 drwxr-xr-x	root/root	usr/share/opera/locale/el/
 -rw-r--r--	root/root	usr/share/opera/locale/el/el.lng
 drwxr-xr-x	root/root	usr/share/opera/locale/en-GB/
+-rw-r--r--	root/root	usr/share/opera/locale/en-GB/bookmarks.adr
 -rw-r--r--	root/root	usr/share/opera/locale/en-GB/en-GB.lng
+-rw-r--r--	root/root	usr/share/opera/locale/en-GB/search.ini
 -rw-r--r--	root/root	usr/share/opera/locale/en-GB/standard_speeddial.ini
 drwxr-xr-x	root/root	usr/share/opera/locale/en/
 -rw-r--r--	root/root	usr/share/opera/locale/en/bookmarks.adr
@@ -86,7 +91,10 @@ drwxr-xr-x	root/root	usr/share/opera/locale/en/
 -rw-r--r--	root/root	usr/share/opera/locale/en/search.ini
 -rw-r--r--	root/root	usr/share/opera/locale/en/standard_speeddial.ini
 drwxr-xr-x	root/root	usr/share/opera/locale/es-ES/
+-rw-r--r--	root/root	usr/share/opera/locale/es-ES/bookmarks.adr
 -rw-r--r--	root/root	usr/share/opera/locale/es-ES/es-ES.lng
+-rw-r--r--	root/root	usr/share/opera/locale/es-ES/search.ini
+-rw-r--r--	root/root	usr/share/opera/locale/es-ES/standard_speeddial.ini
 drwxr-xr-x	root/root	usr/share/opera/locale/es-LA/
 -rw-r--r--	root/root	usr/share/opera/locale/es-LA/es-LA.lng
 drwxr-xr-x	root/root	usr/share/opera/locale/et/
@@ -96,7 +104,10 @@ drwxr-xr-x	root/root	usr/share/opera/locale/fi/
 drwxr-xr-x	root/root	usr/share/opera/locale/fr-CA/
 -rw-r--r--	root/root	usr/share/opera/locale/fr-CA/fr-CA.lng
 drwxr-xr-x	root/root	usr/share/opera/locale/fr/
+-rw-r--r--	root/root	usr/share/opera/locale/fr/bookmarks.adr
 -rw-r--r--	root/root	usr/share/opera/locale/fr/fr.lng
+-rw-r--r--	root/root	usr/share/opera/locale/fr/search.ini
+-rw-r--r--	root/root	usr/share/opera/locale/fr/standard_speeddial.ini
 drwxr-xr-x	root/root	usr/share/opera/locale/fy/
 -rw-r--r--	root/root	usr/share/opera/locale/fy/fy.lng
 drwxr-xr-x	root/root	usr/share/opera/locale/hi/
@@ -111,7 +122,10 @@ drwxr-xr-x	root/root	usr/share/opera/locale/id/
 -rw-r--r--	root/root	usr/share/opera/locale/id/id.lng
 -rw-r--r--	root/root	usr/share/opera/locale/id/standard_speeddial.ini
 drwxr-xr-x	root/root	usr/share/opera/locale/it/
+-rw-r--r--	root/root	usr/share/opera/locale/it/bookmarks.adr
 -rw-r--r--	root/root	usr/share/opera/locale/it/it.lng
+-rw-r--r--	root/root	usr/share/opera/locale/it/search.ini
+-rw-r--r--	root/root	usr/share/opera/locale/it/standard_speeddial.ini
 drwxr-xr-x	root/root	usr/share/opera/locale/ja/
 -rw-r--r--	root/root	usr/share/opera/locale/ja/bookmarks.adr
 -rw-r--r--	root/root	usr/share/opera/locale/ja/ja.lng
@@ -127,7 +141,10 @@ drwxr-xr-x	root/root	usr/share/opera/locale/lt/
 drwxr-xr-x	root/root	usr/share/opera/locale/mk/
 -rw-r--r--	root/root	usr/share/opera/locale/mk/mk.lng
 drwxr-xr-x	root/root	usr/share/opera/locale/nb/
+-rw-r--r--	root/root	usr/share/opera/locale/nb/bookmarks.adr
 -rw-r--r--	root/root	usr/share/opera/locale/nb/nb.lng
+-rw-r--r--	root/root	usr/share/opera/locale/nb/search.ini
+-rw-r--r--	root/root	usr/share/opera/locale/nb/standard_speeddial.ini
 drwxr-xr-x	root/root	usr/share/opera/locale/nl/
 -rw-r--r--	root/root	usr/share/opera/locale/nl/nl.lng
 drwxr-xr-x	root/root	usr/share/opera/locale/nn/
@@ -161,6 +178,9 @@ drwxr-xr-x	root/root	usr/share/opera/locale/te/
 drwxr-xr-x	root/root	usr/share/opera/locale/tr/
 -rw-r--r--	root/root	usr/share/opera/locale/tr/tr.lng
 drwxr-xr-x	root/root	usr/share/opera/locale/uk/
+-rw-r--r--	root/root	usr/share/opera/locale/uk/bookmarks.adr
+-rw-r--r--	root/root	usr/share/opera/locale/uk/search.ini
+-rw-r--r--	root/root	usr/share/opera/locale/uk/standard_speeddial.ini
 -rw-r--r--	root/root	usr/share/opera/locale/uk/uk.lng
 drwxr-xr-x	root/root	usr/share/opera/locale/zh-cn/
 -rw-r--r--	root/root	usr/share/opera/locale/zh-cn/bookmarks.adr
diff --git a/extra/opera/.md5sum b/extra/opera/.md5sum
index 8b61e169b..0707ec5ce 100644
--- a/extra/opera/.md5sum
+++ b/extra/opera/.md5sum
@@ -1,3 +1,3 @@
-c7bc633240155f7b75c6efb36e1392c4  opera-10.00.gcc4-qt4.i386.tar.gz
+c3fd719cf157ae21cb219dd324c44ce7  opera-10.01.gcc4-qt4.i386.tar.gz
 8f78d997a5f64b5cdb765dbbc080368c  opera.desktop
 d8a2da2b2f9601d48ed1987019a5cb57  opera.png
diff --git a/extra/opera/Pkgfile b/extra/opera/Pkgfile
index 9e8677704..710bb6a46 100644
--- a/extra/opera/Pkgfile
+++ b/extra/opera/Pkgfile
@@ -1,4 +1,4 @@
-# Description: Navigateur web
+# Description: Navigateur web basé sur la librairie qt
 # URL: http://www.opera.com
 # Maintainer: NuTyX core team
 # Packager: geantbrun at gmail dot com
@@ -12,13 +12,11 @@ if [ "`uname -m`" == "i686" ]; then
 else
         _ARCH=x86_64
 fi
-source=( http://mirror.ndnet.ch/opera/linux/1000/final/en/${_ARCH}/opera-10.00.gcc4-qt4.${_ARCH}.tar.gz \
-        opera.desktop \
-        opera.png )
+source=( http://mirror.switch.ch/ftp/mirror/opera/linux/1001/final/en/${_ARCH}/opera-$version.gcc4-qt4.${_ARCH}.tar.gz \
+        opera.desktop opera.png )
 	
 build() {
 	cd $name-*
-#	sed 's|/usr/X11R6/lib/mozilla/plugins=1|/opt/mozilla/lib/plugins=1|' -i ini/pluginpath.ini
 	./install.sh DESTDIR=$PKG
 	mkdir -p $PKG/usr/share/{applications,licences/opera,icons/hicolor/48x48/apps}
 	install -D -m 644 ../opera.desktop $PKG/usr/share/applications/
diff --git a/kde/kdebase-workspace/.footprint b/kde/kdebase-workspace/.footprint
index 0ad954601..2e897c632 100644
--- a/kde/kdebase-workspace/.footprint
+++ b/kde/kdebase-workspace/.footprint
@@ -648,6 +648,22 @@ drwxr-xr-x	root/root	opt/kde/share/apps/kdm/sessions/
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/xfce.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/sessions/xfce4.desktop
 drwxr-xr-x	root/root	opt/kde/share/apps/kdm/themes/
+drwxr-xr-x	root/root	opt/kde/share/apps/kdm/themes/carbon/
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/1280x800.jpg
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/KdmGreeterTheme.desktop
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/caps.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/carbon.xml
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/icon-kde.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/pw-entry-li.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/pw-entry.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/screenshot.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/session_button-li.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/session_button.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/system_button-li.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/system_button.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/user-entry-li.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/user-entry.png
+-rwxr-xr-x	install/root	opt/kde/share/apps/kdm/themes/carbon/win-login.png
 drwxr-xr-x	root/root	opt/kde/share/apps/kdm/themes/circles/
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/themes/circles/KdmGreeterTheme.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kdm/themes/circles/background.svg
diff --git a/kde/kdebase-workspace/.md5sum b/kde/kdebase-workspace/.md5sum
index 3ff568b2e..fef1b788c 100644
--- a/kde/kdebase-workspace/.md5sum
+++ b/kde/kdebase-workspace/.md5sum
@@ -1,5 +1,6 @@
 381772c7b73076ade63ea724637e2f1a  NuTyXlogo.png
 88a7a094728a782ae74b8c443cca0c82  Xsession.kde4
+84734ed5eca3f1b38354a82e0a9139a5  carbon-kdm.tar.gz
 304ef605ca6fc78f538ef38f7ae93b26  ede.desktop
 0af67c6ee6385cc86f694bc8e1675ddb  kdebase-workspace-4.3.3.tar.bz2
 a6e11d5c5320bdd96e6d7d01a9317e9b  kdm
diff --git a/kde/kdebase-workspace/Pkgfile b/kde/kdebase-workspace/Pkgfile
index 1b699b513..ad8f2f652 100755
--- a/kde/kdebase-workspace/Pkgfile
+++ b/kde/kdebase-workspace/Pkgfile
@@ -6,9 +6,10 @@
 
 name=kdebase-workspace
 version=4.3.3
-release=1
+release=2
 source=(http://download.kde.org/stable/$version/src/$name-$version.tar.bz2\
-        kdm lxde.desktop ede.desktop Xsession.kde4 NuTyXlogo.png)
+        kdm lxde.desktop ede.desktop Xsession.kde4 NuTyXlogo.png\
+	http://kiao.no-ip.info/NuTyX/files/carbon-kdm.tar.gz)
 
 build() {
         mkdir -v -p $PKG/etc/kde
@@ -24,6 +25,7 @@ build() {
         ln -svf ../init.d/kdm $PKG/etc/rc.d/rc6.d/K10kdm
 
         cd $name-$version
+	sed -i "s/kdelogo/NuTyXlogo/" kwin/clients/redmond/redmond.cpp
         mkdir build
         cd build
         cmake ../ -DCMAKE_INSTALL_PREFIX=$KDE_PREFIX \
@@ -35,13 +37,13 @@ build() {
         $PKG/$KDE_PREFIX/share/apps/kdm/sessions/
         install -m755 ../Xsession.kde4 \
         $PKG/$KDE_PREFIX/share/config/kdm/Xsession
+	cp -a ../carbon \
+	$PKG/$KDE_PREFIX/share/apps/kdm/themes/
         sed -i "s/AllowRootLogin=false/AllowRootLogin=true/" \
         $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
         sed -i "s@gnome-session@/opt/gnome/bin/gnome-session@" \
         $PKG/$KDE_PREFIX/share/apps/kdm/sessions/gnome.desktop
-#       sed -i "s@opt/kde/@opt/kde4@" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
-#       sed -i "/Theme=\/opt/d" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
-        sed -i "s/kdelogo.png/NuTyXlogo.png/" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
+        sed -i "s/oxygen-air/carbon/" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
         sed -i "s/xdm.pid/kdm.pid/" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
         sed -i "s/#Language=de_DE/Language=fr_FR/" $PKG/$KDE_PREFIX/share/config/kdm/kdmrc
         mv ../NuTyXlogo.png $PKG/$KDE_PREFIX/share/apps/kdm/pics/