Merge remote branch 'ojab/master'

Conflicts:
	templates/python/devel.template
	templates/python/template

--HG--
extra : convert_revision : f18a0b2210cba1f7f74577fb8f8beb49947d4217

.gitignore

@@ -4,6 +4,7 @@ destdir/
 srcdistdir/
 builddir/
 packages/
+masterdir/
 bin/xbps-bin/xbps-bin
 bin/xbps-cmpver/xbps-cmpver
 bin/xbps-digest/xbps-digest

templates/firefox/template

@@ -1,9 +1,8 @@
 # Template build file for 'firefox'.
 pkgname=firefox
-version=3.0.3
-wrksrc=mozilla
-distfiles="
-http://sunsite.rediris.es/pub/mozilla.org/firefox/releases/3.0.3/source/$pkgname-$version-source.tar.bz2"
+version=3.5.5
+wrksrc=mozilla-1.9.1
+distfiles="ftp://ftp.mozilla.org/pub/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-default-toolkit=cairo-gtk2 --disable-dbus
  --disable-crashreporter --enable-xft --with-pthreads --enable-xinerama
@@ -12,7 +11,7 @@ configure_args="--enable-default-toolkit=cairo-gtk2 --disable-dbus
  --disable-gnomeui"
 short_desc="Lightweight gecko-based web browser"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=50f5c23182ac8bfe1a33502fb04814a3961c5033
+checksum=2abe7b5561267c230df27951d1d8c6c5853d06ca2426997fdf0a63c5db689feb
 long_desc="
  Mozilla Firefox is a free, open-source and cross-platform web browser
  for Windows, Linux, MacOS X and many other operating systems. It is
@@ -23,3 +22,8 @@ long_desc="
  Firefox also offers excellent bookmark and history management, and it
  can be extended by developers using industry standards such as XML,
  CSS, JavaScript, C++, etc. Many extensions are available."
+
+Add_dependency full zip
+Add_dependency full gtk+
+Add_dependency full alsa-lib
+Add_dependency full libIDL

templates/kernel-libc-headers/template

@@ -1,6 +1,8 @@
 # Template file for 'kernel-libc-headers'
 pkgname=kernel-libc-headers
-version=2.6.31.5
+_kernel_ver=2.6.31
+_kernel_patch_ver=6
+version=${_kernel_ver}.${_kernel_patch_ver}
 wrksrc="linux-$version"
 distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
 build_style=only-install
@@ -9,7 +11,7 @@ make_install_target="
  headers_install"
 short_desc="The Linux kernel headers for development"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=3988b645a9350267de5768cc8f41c966c26d8ebfffb31519bf6c8874258603bb
+checksum=7751de380eab755a647c7137949bc6207fd14379e5e8e5c15c421fdc8390c45e
 long_desc="
  This package provides the linux kernel headers for use in userspace."
 

templates/libxml2/template

@@ -1,11 +1,11 @@
 # Template build file for 'libxml2'.
 pkgname=libxml2
-version=2.7.5
+version=2.7.6
 distfiles="http://xmlsoft.org/sources/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 short_desc="Library providing XML and HTML support"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=af5a9a6d9ffb09756f0792fb402720ca2505762b7f6dd99ba277d5fbfffcec6d
+checksum=238c4f0203c012e5776522640c0fb3ac532c4064981c1ce3e74c00b75501d761
 long_desc="
  This library allows to manipulate XML files. It includes support
  to read, modify and write XML and HTML files. There is DTDs support

templates/libxslt/template

@@ -1,11 +1,11 @@
 # Template build file for 'libxslt'.
 pkgname=libxslt
-version=1.1.24
+version=1.1.26
 distfiles="ftp://xmlsoft.org/libxslt/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 short_desc="XSLT parser library from the GNOME project"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=c0c10944841e9a79f29d409c6f8da0d1b1af0403eb3819c82c788dfa6a180b3e
+checksum=55dd52b42861f8a02989d701ef716d6280bfa02971e967c285016f99c66e3db1
 long_desc="
  Libxslt is the XSLT C library developed for the Gnome project. XSLT itself is
  an XML language to define transformation for XML. Libxslt is based on libxml2