Merge branch 'master' of ssh://kiao.no-ip.info:443/~/attapu

12 files changed, 19 insertions, 17 deletions

diff --git a/extra/pidgin/.footprint b/extra/pidgin/.footprint
index 41315e9aa..6753476a7 100644
--- a/extra/pidgin/.footprint
+++ b/extra/pidgin/.footprint
@@ -199,9 +199,9 @@ lrwxrwxrwx	root/root	usr/lib/libgnt.so -> libgnt.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libgnt.so.0 -> libgnt.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libgnt.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libpurple.la
-lrwxrwxrwx	root/root	usr/lib/libpurple.so -> libpurple.so.0.7.3
-lrwxrwxrwx	root/root	usr/lib/libpurple.so.0 -> libpurple.so.0.7.3
--rwxr-xr-x	root/root	usr/lib/libpurple.so.0.7.3
+lrwxrwxrwx	root/root	usr/lib/libpurple.so -> libpurple.so.0.7.4
+lrwxrwxrwx	root/root	usr/lib/libpurple.so.0 -> libpurple.so.0.7.4
+-rwxr-xr-x	root/root	usr/lib/libpurple.so.0.7.4
 drwxr-xr-x	root/root	usr/lib/pidgin/
 -rwxr-xr-x	root/root	usr/lib/pidgin/convcolors.la
 -rwxr-xr-x	root/root	usr/lib/pidgin/convcolors.so
@@ -682,7 +682,6 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/emotes/small/
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/cold.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/confused.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/console.png
--rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/cool.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/cross.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/crying.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/devil.png
@@ -694,7 +693,6 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/emotes/small/
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/excruciating.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/eyeroll.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/girl.png
--rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/grin.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/grumpy.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/happy.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/hot.png
@@ -739,6 +737,7 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/emotes/small/
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/surfing.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/theme
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/thinking.png
+-rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/thunder.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/tongue.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/tv.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/emotes/small/typing.png
@@ -986,15 +985,18 @@ drwxr-xr-x	root/root	usr/share/purple/ca-certs/
 -rw-r--r--	root/root	usr/share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/CAcert_Class3.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/CAcert_Root.pem
+-rw-r--r--	root/root	usr/share/purple/ca-certs/Deutsche_Telekom_Root_CA_2.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Entrust.net_Secure_Server_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Equifax_Secure_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
+-rw-r--r--	root/root	usr/share/purple/ca-certs/Go_Daddy_Class_2_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Internet_Authority.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/StartCom_Certification_Authority.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/StartCom_Free_SSL_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Thawte_Premium_Server_CA.pem
+-rw-r--r--	root/root	usr/share/purple/ca-certs/Thawte_Primary_Root_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/ValiCert_Class_2_VA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
diff --git a/extra/pidgin/.md5sum b/extra/pidgin/.md5sum
index 5ca5e2834..012fb432a 100644
--- a/extra/pidgin/.md5sum
+++ b/extra/pidgin/.md5sum
@@ -1 +1 @@
-e4bbadadae85e5e008690b52dd51f102  pidgin-2.7.3.tar.bz2
+2960d3e78e50d5bbcf4533c09ba467d8  pidgin-2.7.4.tar.bz2
diff --git a/extra/pidgin/Pkgfile b/extra/pidgin/Pkgfile
index b021b8c2d..17e63d1a5 100644
--- a/extra/pidgin/Pkgfile
+++ b/extra/pidgin/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: gtkspell, glib, gtk, libxml2, p5-xml-parser, gnutls, nss, nspr, xorg-libxscrnsaver, gstreamer, startup-notification, hicolor-icon-theme, libidn, farsight2
 
 name=pidgin
-version=2.7.3
+version=2.7.4
 release=1
 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2)
 
diff --git a/kde/amarok/Pkgfile b/kde/amarok/Pkgfile
index 721b87fb1..1c1d1765f 100755
--- a/kde/amarok/Pkgfile
+++ b/kde/amarok/Pkgfile
@@ -8,7 +8,7 @@
 name=amarok
 version=2.3.2
 release=2
-source=(ftp://ftp.kde.org/pub/kde/stable/$name/$version/src/$name-$version.tar.bz2
+source=(ftp://kde.mirrors.pair.com/stable/$name/$version/src/$name-$version.tar.bz2
 	splash_screen.jpg
 	scanning-qt-regression.patch)
 
diff --git a/kde/kdeaccessibility/Pkgfile b/kde/kdeaccessibility/Pkgfile
index 57cf23be5..5fb457a8e 100755
--- a/kde/kdeaccessibility/Pkgfile
+++ b/kde/kdeaccessibility/Pkgfile
@@ -7,7 +7,7 @@
 name=kdeaccessibility
 version=4.5.2
 release=1
-source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)
+source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/kde/kdepim-runtime/Pkgfile b/kde/kdepim-runtime/Pkgfile
index ddc15e196..ce72fb7bd 100755
--- a/kde/kdepim-runtime/Pkgfile
+++ b/kde/kdepim-runtime/Pkgfile
@@ -1,13 +1,13 @@
 # Description: Libs de base nécessaires a kdepim
 # URL: http://www.kde.org
 # Maintainer: NuTyX packager team
-# Packager: lesibel at free dot ch
+# Packager: lesibel at free dot fr
 # Depends on: kdepimlibs
 
 name=kdepim-runtime
 version=4.5-beta1
 release=1
-source=( ftp://ftp.kde.org/pub/kde/unstable/kdepim/$version/$name-$version.tar.bz2)
+source=( ftp://kde.mirrors.pair.com/unstable/kdepim/$version/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/kde/kdepim/Pkgfile b/kde/kdepim/Pkgfile
index 2e8c09b87..46a459fb5 100755
--- a/kde/kdepim/Pkgfile
+++ b/kde/kdepim/Pkgfile
@@ -7,7 +7,7 @@
 name=kdepim
 version=4.5-beta1
 release=1
-source=( ftp://ftp.kde.org/pub/kde/unstable/$name/$name-$version.tar.bz2)
+source=( ftp://kde.mirrors.pair.com/unstable/$name/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/kde/kdevelop-php-docs/Pkgfile b/kde/kdevelop-php-docs/Pkgfile
index 13ca6c286..dc327d3a4 100755
--- a/kde/kdevelop-php-docs/Pkgfile
+++ b/kde/kdevelop-php-docs/Pkgfile
@@ -7,7 +7,7 @@
 name=kdevelop-php-docs
 version=1.0.1
 release=1
-source=( ftp://ftp.kde.org/pub/kde/stable/kdevelop/4.0.1/src/$name-$version.tar.bz2)
+source=( ftp://kde.mirrors.pair.com/stable/kdevelop/4.0.1/src/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/kde/kdevelop-php/Pkgfile b/kde/kdevelop-php/Pkgfile
index ed88933fe..a0856d27f 100755
--- a/kde/kdevelop-php/Pkgfile
+++ b/kde/kdevelop-php/Pkgfile
@@ -7,7 +7,7 @@
 name=kdevelop-php
 version=1.0.1
 release=1
-source=( ftp://ftp.kde.org/pub/kde/stable/kdevelop/4.0.1/src/$name-$version.tar.bz2)
+source=( ftp://kde.mirrors.pair.com/stable/kdevelop/4.0.1/src/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/kde/kdevelop/Pkgfile b/kde/kdevelop/Pkgfile
index d9798f4bb..6a694a18b 100755
--- a/kde/kdevelop/Pkgfile
+++ b/kde/kdevelop/Pkgfile
@@ -7,7 +7,7 @@
 name=kdevelop
 version=4.0.2
 release=1
-source=( ftp://ftp.kde.org/pub/kde/stable/$name/$version/src/$name-$version.tar.bz2)
+source=( ftp://kde.mirrors.pair.com/stable/$name/$version/src/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/kde/kdevplatform/Pkgfile b/kde/kdevplatform/Pkgfile
index 96e0eb89e..e3cf427c7 100755
--- a/kde/kdevplatform/Pkgfile
+++ b/kde/kdevplatform/Pkgfile
@@ -7,7 +7,7 @@
 name=kdevplatform
 version=1.0.2
 release=1
-source=( ftp://ftp.kde.org/pub/kde/stable/kdevelop/4.0.2/src/$name-$version.tar.bz2)
+source=( ftp://kde.mirrors.pair.com/stable/kdevelop/4.0.2/src/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/kde/konversation/Pkgfile b/kde/konversation/Pkgfile
index cb3a67e31..66a56f3e2 100644
--- a/kde/konversation/Pkgfile
+++ b/kde/konversation/Pkgfile
@@ -7,7 +7,7 @@
 name=konversation
 version=1.3.1
 release=1
-source=(ftp://ftp.kde.org/pub/kde/stable/$name/$version/src/$name-$version.tar.bz2)
+source=(ftp://kde.mirrors.pair.com/stable/$name/$version/src/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version