Merge commit 'lesibel/master'

8 files changed, 35 insertions, 24 deletions

diff --git a/extra/gconf/.footprint b/extra/gconf/.footprint
index c5b26cc1f..e68cf34b0 100644
--- a/extra/gconf/.footprint
+++ b/extra/gconf/.footprint
@@ -4,6 +4,7 @@ drwxr-xr-x	root/root	etc/dbus-1/system.d/
 -rw-r--r--	root/root	etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf
 drwxr-xr-x	root/root	etc/gconf/
 drwxr-xr-x	root/root	etc/gconf/2/
+-rw-r--r--	root/root	etc/gconf/2/evoldap.conf
 -rw-r--r--	root/root	etc/gconf/2/path
 drwxr-xr-x	root/root	etc/gconf/gconf.xml.defaults/
 drwxr-xr-x	root/root	etc/gconf/gconf.xml.mandatory/
@@ -28,6 +29,8 @@ drwxr-xr-x	root/root	usr/include/gconf/2/gconf/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/GConf/
 drwxr-xr-x	root/root	usr/lib/GConf/2/
+-rwxr-xr-x	root/root	usr/lib/GConf/2/libgconfbackend-evoldap.la
+-rwxr-xr-x	root/root	usr/lib/GConf/2/libgconfbackend-evoldap.so
 -rwxr-xr-x	root/root	usr/lib/GConf/2/libgconfbackend-oldxml.la
 -rwxr-xr-x	root/root	usr/lib/GConf/2/libgconfbackend-oldxml.so
 -rwxr-xr-x	root/root	usr/lib/GConf/2/libgconfbackend-xml.la
@@ -42,6 +45,9 @@ lrwxrwxrwx	root/root	usr/lib/libgconf-2.so.4 -> libgconf-2.so.4.1.5
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gconf-2.0.pc
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/GConf/
+drwxr-xr-x	root/root	usr/share/GConf/schema/
+-rw-r--r--	root/root	usr/share/GConf/schema/evoldap.schema
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/gconf-2.m4
 drwxr-xr-x	root/root	usr/share/dbus-1/
diff --git a/extra/gconf/Pkgfile b/extra/gconf/Pkgfile
index b6dcb694b..e3b4046ff 100644
--- a/extra/gconf/Pkgfile
+++ b/extra/gconf/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://www.gnome.org/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: orbit2, polkit, glib, gtk
+# Depends on: orbit2, polkit, glib, gtk, openldap
 
 name=gconf
 version=2.28.1
diff --git a/extra/imagemagick/.md5sum b/extra/imagemagick/.md5sum
index ed236ad5e..c82532173 100644
--- a/extra/imagemagick/.md5sum
+++ b/extra/imagemagick/.md5sum
@@ -1 +1 @@
-2594432500e8c718c8f07ed2e663261d  ImageMagick-6.6.1-5.tar.bz2
+97cc92d9e8dd418052cbb2e10bcc4136  ImageMagick-6.6.1-10.tar.bz2
diff --git a/extra/imagemagick/Pkgfile b/extra/imagemagick/Pkgfile
index 5b4600514..bde09bf55 100755
--- a/extra/imagemagick/Pkgfile
+++ b/extra/imagemagick/Pkgfile
@@ -5,9 +5,9 @@
 # Depends on: freetype, ghostscript, lcms, libgsf, giflib, libxml2, openexr
 
 name=imagemagick
-version=6.6.1.5
+version=6.6.1.10
 release=1
-_version=6.6.1-5
+_version=6.6.1-10
 source=(ftp://gd.tuwien.ac.at/pub/graphics/ImageMagick/ImageMagick-${_version}.tar.bz2)
 
 build () {
diff --git a/extra/lcms/.footprint b/extra/lcms/.footprint
index 8c6ef0a1e..60104f56b 100644
--- a/extra/lcms/.footprint
+++ b/extra/lcms/.footprint
@@ -1,23 +1,28 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwxr-xr-x	root/root	usr/bin/jpgicc
--rwxr-xr-x	root/root	usr/bin/linkicc
--rwxr-xr-x	root/root	usr/bin/psicc
--rwxr-xr-x	root/root	usr/bin/tificc
--rwxr-xr-x	root/root	usr/bin/transicc
+-rwxr-xr-x	root/root	usr/bin/icc2ps
+-rwxr-xr-x	root/root	usr/bin/icclink
+-rwxr-xr-x	root/root	usr/bin/icctrans
+-rwxr-xr-x	root/root	usr/bin/jpegicc
+-rwxr-xr-x	root/root	usr/bin/tiffdiff
+-rwxr-xr-x	root/root	usr/bin/tifficc
+-rwxr-xr-x	root/root	usr/bin/wtpt
 drwxr-xr-x	root/root	usr/include/
--rw-r--r--	root/root	usr/include/lcms2.h
--rw-r--r--	root/root	usr/include/lcms2_plugin.h
+-rw-r--r--	root/root	usr/include/icc34.h
+-rw-r--r--	root/root	usr/include/lcms.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/liblcms2.a
--rwxr-xr-x	root/root	usr/lib/liblcms2.la
-lrwxrwxrwx	root/root	usr/lib/liblcms2.so -> liblcms2.so.2.0.0
-lrwxrwxrwx	root/root	usr/lib/liblcms2.so.2 -> liblcms2.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/liblcms2.so.2.0.0
+-rw-r--r--	root/root	usr/lib/liblcms.a
+-rwxr-xr-x	root/root	usr/lib/liblcms.la
+lrwxrwxrwx	root/root	usr/lib/liblcms.so -> liblcms.so.1.0.19
+lrwxrwxrwx	root/root	usr/lib/liblcms.so.1 -> liblcms.so.1.0.19
+-rwxr-xr-x	root/root	usr/lib/liblcms.so.1.0.19
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/lcms2.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/lcms.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/jpgicc.1.gz
--rw-r--r--	root/root	usr/share/man/man1/tificc.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/icc2ps.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/icclink.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/jpegicc.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/tifficc.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/wtpt.1.gz
diff --git a/extra/lcms/.md5sum b/extra/lcms/.md5sum
index ffe9a9678..db140ee1e 100644
--- a/extra/lcms/.md5sum
+++ b/extra/lcms/.md5sum
@@ -1 +1 @@
-c4f115462a7a5b306c247d018d7a8982  lcms2-2.0a.tar.gz
+8af94611baf20d9646c7c2c285859818  lcms-1.19.tar.gz
diff --git a/extra/lcms/Pkgfile b/extra/lcms/Pkgfile
index 3809ab197..290d488b7 100755
--- a/extra/lcms/Pkgfile
+++ b/extra/lcms/Pkgfile
@@ -5,11 +5,11 @@
 # Depends on: libtiff, libjpeg, python
 
 name=lcms
-version=2.0
+version=1.19
 release=1
-#source=( http://www.littlecms.com/$name-$version.tar.gz)
+source=( http://www.littlecms.com/$name-$version.tar.gz)
 
-source=(http://freefr.dl.sourceforge.net/project/lcms/lcms/2.0/lcms2-2.0a.tar.gz)
+#source=(http://freefr.dl.sourceforge.net/project/lcms/lcms/2.0/lcms2-2.0a.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/extra/loudmouth/Pkgfile b/extra/loudmouth/Pkgfile
index e4d8d39de..7437997d3 100644
--- a/extra/loudmouth/Pkgfile
+++ b/extra/loudmouth/Pkgfile
@@ -2,7 +2,7 @@
 # URL: http://developer.imendio.com/wiki/Loudmouth
 # Packager: thierryn1 at hispeed dot ch
 # Maintainer: NuTyX core team
-# Depends on: libidn
+# Depends on: libidn, glib
 
 name=loudmouth
 version=1.4.3