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

9 files changed, 14 insertions, 12 deletions

diff --git a/extra/gnupg1/.footprint.i686 b/extra/gnupg1/.footprint.i686
index 4d8999b0b..17e310286 100644
--- a/extra/gnupg1/.footprint.i686
+++ b/extra/gnupg1/.footprint.i686
@@ -9,6 +9,7 @@ drwxr-xr-x	root/root	usr/lib/gnupg/
 -rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_curl
 -rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_finger
 -rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_hkp
+-rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_ldap
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/gnupg/
 -rw-r--r--	root/root	usr/share/gnupg/FAQ
diff --git a/extra/gnupg1/.footprint.x86_64 b/extra/gnupg1/.footprint.x86_64
index 4d8999b0b..17e310286 100644
--- a/extra/gnupg1/.footprint.x86_64
+++ b/extra/gnupg1/.footprint.x86_64
@@ -9,6 +9,7 @@ drwxr-xr-x	root/root	usr/lib/gnupg/
 -rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_curl
 -rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_finger
 -rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_hkp
+-rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_ldap
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/gnupg/
 -rw-r--r--	root/root	usr/share/gnupg/FAQ
diff --git a/extra/gnupg1/Pkgfile b/extra/gnupg1/Pkgfile
index b1db0c616..3129c0eb6 100644
--- a/extra/gnupg1/Pkgfile
+++ b/extra/gnupg1/Pkgfile
@@ -2,12 +2,12 @@
 # URL: 	http://www.gnupg.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: libusb, curl
-# Run on: libusb,curl
+# Depends on: libusb, curl, libldap
+# Run on: libusb,curl,libldap
 
 name=gnupg1
 version=1.4.11
-release=2
+release=3
 source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$version.tar.bz2)
 
 build() {
diff --git a/extra/gpgme/Pkgfile b/extra/gpgme/Pkgfile
index 913b76a6c..a2c895382 100644
--- a/extra/gpgme/Pkgfile
+++ b/extra/gpgme/Pkgfile
@@ -2,12 +2,12 @@
 # URL: http://www.gnupg.org/related_software/gpgme/
 # Maintainer: NuTyX coreteam
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gnupg
-# Run on: gnupg
+# Depends on: gnupg, gnupg1
+# Run on: gnupg,gnupg1
 
 name=gpgme
 version=1.3.0
-release=1
+release=2
 source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.gz)
 
 build() {
diff --git a/extra/gtkmm/Pkgfile b/extra/gtkmm/Pkgfile
index b33e2b674..623bab298 100644
--- a/extra/gtkmm/Pkgfile
+++ b/extra/gtkmm/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
 # Depends on: gtk, pangomm, cairomm, atkmm, xorg-libxcursor, xorg-libxdamage, xorg-libxrandr, xorg-libxinerama
-# Run on: gtk,pangomm,glibmm,cairomm
+# Run on: gtk,pangomm,glibmm,cairomm,atkmm
 
 name=gtkmm
 version=2.24.0
diff --git a/extra/pinentry/Pkgfile b/extra/pinentry/Pkgfile
index 69844b74d..d68c97afe 100644
--- a/extra/pinentry/Pkgfile
+++ b/extra/pinentry/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer: NuTyX
 # Packager: thierryn1 at hispeed dot ch
 # Depends on: gtk, qt
-# Run on: gtk
+# Run on:
 
 name=pinentry
 version=0.8.1
diff --git a/extra/sylpheed/.md5sum.i686 b/extra/sylpheed/.md5sum.i686
index da4fb3541..29db648ed 100644
--- a/extra/sylpheed/.md5sum.i686
+++ b/extra/sylpheed/.md5sum.i686
@@ -1 +1 @@
-311847d73d0dda63a48e5ec107538424  sylpheed-3.1.0.tar.bz2
+a9e3df4255b9f307cf50d0b38e5fd811  sylpheed-3.1.1.tar.bz2
diff --git a/extra/sylpheed/.md5sum.x86_64 b/extra/sylpheed/.md5sum.x86_64
index da4fb3541..29db648ed 100644
--- a/extra/sylpheed/.md5sum.x86_64
+++ b/extra/sylpheed/.md5sum.x86_64
@@ -1 +1 @@
-311847d73d0dda63a48e5ec107538424  sylpheed-3.1.0.tar.bz2
+a9e3df4255b9f307cf50d0b38e5fd811  sylpheed-3.1.1.tar.bz2
diff --git a/extra/sylpheed/Pkgfile b/extra/sylpheed/Pkgfile
index 95ca213ec..375d38ecc 100644
--- a/extra/sylpheed/Pkgfile
+++ b/extra/sylpheed/Pkgfile
@@ -3,10 +3,10 @@
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
 # Depends on: gtk, gpgme
-# Run on: atk,expat,freetype,glib,libpng,openssl,pcre,cairo,cyrus-sasl,fontconfig,glitz,libassuan,libgpg-error,libldap,pango,gtk,gpgme,gnupg,gnupg1
+# Run on: atk,expat,freetype,glib,libpng,openssl,pcre,cairo,cyrus-sasl,fontconfig,glitz,libassuan,libgpg-error,libldap,pango,gtk,gpgme
 
 name=sylpheed
-version=3.1.0
+version=3.1.1
 release=1
 source=(http://sylpheed.sraoss.jp/sylpheed/v3.1/$name-$version.tar.bz2)