Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/haskell-stm/PKGBUILD
	community-staging/haskell-syb/PKGBUILD
	community/cantata/PKGBUILD
	community/linux-tools/PKGBUILD
	community/python-pymongo/PKGBUILD
	core/less/PKGBUILD
	extra/alsa-plugins/PKGBUILD
	extra/avfs/PKGBUILD
	extra/cups/PKGBUILD
	extra/icedtea-web/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdemultimedia-mplayerthumbs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mysql/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vim/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	multilib/lib32-alsa-lib/PKGBUILD
	multilib/lib32-alsa-plugins/PKGBUILD
	multilib/lib32-fontconfig/PKGBUILD
	staging/ghc/PKGBUILD
	staging/ghc/build.mk
	staging/haskell-http/PKGBUILD
	staging/haskell-mtl/PKGBUILD
	staging/haskell-network/PKGBUILD
	staging/haskell-parsec/PKGBUILD
	staging/haskell-random/PKGBUILD
	staging/haskell-text/PKGBUILD
	staging/haskell-transformers/PKGBUILD
	staging/haskell-zlib/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/coreutils/coreutils.install
	testing/dhcpcd/PKGBUILD
	testing/kactivities/PKGBUILD
	testing/kdeaccessibility-jovie/PKGBUILD
	testing/kdeaccessibility-kaccessible/PKGBUILD
	testing/kdeaccessibility-kmag/PKGBUILD
	testing/kdeaccessibility-kmousetool/PKGBUILD
	testing/kdeaccessibility-kmouth/PKGBUILD
	testing/kdeadmin/PKGBUILD
	testing/kdeartwork/PKGBUILD
	testing/kdebase-konsole/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebase/PKGBUILD
	testing/kdebindings-kimono/PKGBUILD
	testing/kdebindings-korundum/PKGBUILD
	testing/kdebindings-kross/PKGBUILD
	testing/kdebindings-perlkde/PKGBUILD
	testing/kdebindings-perlqt/PKGBUILD
	testing/kdebindings-python/PKGBUILD
	testing/kdebindings-qtruby/PKGBUILD
	testing/kdebindings-qyoto/PKGBUILD
	testing/kdebindings-smokegen/PKGBUILD
	testing/kdebindings-smokekde/PKGBUILD
	testing/kdebindings-smokeqt/PKGBUILD
	testing/kdeedu-analitza/PKGBUILD
	testing/kdeedu-blinken/PKGBUILD
	testing/kdeedu-cantor/PKGBUILD
	testing/kdeedu-kalgebra/PKGBUILD
	testing/kdeedu-kalzium/PKGBUILD
	testing/kdeedu-kanagram/PKGBUILD
	testing/kdeedu-kbruch/PKGBUILD
	testing/kdeedu-kgeography/PKGBUILD
	testing/kdeedu-khangman/PKGBUILD
	testing/kdeedu-kig/PKGBUILD
	testing/kdeedu-kiten/PKGBUILD
	testing/kdeedu-klettres/PKGBUILD
	testing/kdeedu-kmplot/PKGBUILD
	testing/kdeedu-kstars/PKGBUILD
	testing/kdeedu-ktouch/PKGBUILD
	testing/kdeedu-kturtle/PKGBUILD
	testing/kdeedu-kwordquiz/PKGBUILD
	testing/kdeedu-marble/PKGBUILD
	testing/kdeedu-pairs/PKGBUILD
	testing/kdeedu-parley/PKGBUILD
	testing/kdeedu-rocs/PKGBUILD
	testing/kdeedu-step/PKGBUILD
	testing/kdegames/PKGBUILD
	testing/kdegraphics-gwenview/PKGBUILD
	testing/kdegraphics-kamera/PKGBUILD
	testing/kdegraphics-kcolorchooser/PKGBUILD
	testing/kdegraphics-kgamma/PKGBUILD
	testing/kdegraphics-kolourpaint/PKGBUILD
	testing/kdegraphics-kruler/PKGBUILD
	testing/kdegraphics-ksaneplugin/PKGBUILD
	testing/kdegraphics-ksnapshot/PKGBUILD
	testing/kdegraphics-mobipocket/PKGBUILD
	testing/kdegraphics-okular/PKGBUILD
	testing/kdegraphics-strigi-analyzer/PKGBUILD
	testing/kdegraphics-svgpart/PKGBUILD
	testing/kdegraphics-thumbnailers/PKGBUILD
	testing/kdemultimedia-audiocd-kio/PKGBUILD
	testing/kdemultimedia-dragonplayer/PKGBUILD
	testing/kdemultimedia-ffmpegthumbs/PKGBUILD
	testing/kdemultimedia-juk/PKGBUILD
	testing/kdemultimedia-kmix/PKGBUILD
	testing/kdemultimedia-kscd/PKGBUILD
	testing/kdemultimedia-mplayerthumbs/PKGBUILD
	testing/kdenetwork/PKGBUILD
	testing/kdepim-runtime/PKGBUILD
	testing/kdepim/PKGBUILD
	testing/kdepimlibs/PKGBUILD
	testing/kdeplasma-addons/PKGBUILD
	testing/kdesdk-kate/PKGBUILD
	testing/kdesdk/PKGBUILD
	testing/kdetoys/PKGBUILD
	testing/kdeutils-filelight/PKGBUILD
	testing/kdeutils-kcalc/PKGBUILD
	testing/kdeutils-kcharselect/PKGBUILD
	testing/kdeutils-kdf/PKGBUILD
	testing/kdeutils-kfloppy/PKGBUILD
	testing/kdeutils-kgpg/PKGBUILD
	testing/kdeutils-kremotecontrol/PKGBUILD
	testing/kdeutils-ktimer/PKGBUILD
	testing/kdeutils-kwallet/PKGBUILD
	testing/kdeutils-superkaramba/PKGBUILD
	testing/kdeutils-sweeper/PKGBUILD
	testing/kdewebdev/PKGBUILD
	testing/kmod/PKGBUILD
	testing/libkcddb/PKGBUILD
	testing/libkcompactdisc/PKGBUILD
	testing/libkdcraw/PKGBUILD
	testing/libkdeedu/PKGBUILD
	testing/libkexiv2/PKGBUILD
	testing/libkipi/PKGBUILD
	testing/libksane/PKGBUILD
	testing/libmpc/PKGBUILD
	testing/nepomuk-core/PKGBUILD
	testing/procps-ng/PKGBUILD
	testing/sudo/PKGBUILD
	testing/sysvinit/PKGBUILD
	testing/util-linux/PKGBUILD
	testing/util-linux/util-linux.install

1 files changed, 7 insertions, 7 deletions

diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index 5835a6438..401338a03 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160935 2012-06-07 06:29:24Z pierre $
+# $Id: PKGBUILD 166406 2012-09-07 16:52:15Z pierre $
 
 pkgname=fetchmail
-pkgver=6.3.21
-pkgrel=4
+pkgver=6.3.22
+pkgrel=1
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fetchmail.berlios.de/"
@@ -14,11 +14,11 @@ optdepends=('tk: for using fetchmailconf'
 backup=('etc/conf.d/fetchmail')
 options=('!makeflags')
 install='fetchmail.install'
-source=("http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz.asc"
+source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz"
+        "http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz.asc"
         'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service')
-sha1sums=('4f1e5f2e1a616d4007da1de9c976c2c1fb5dcb81'
-          'bc8c68ec0d71b97d3168981cbaa4b04ab8e56059'
+sha1sums=('3bb755010dbe568d53840e22d8e87d8d5db25b19'
+          '27184b75ef09c5202bede9863ae8abc3d0cdb1d2'
           'fc25180f1add26df0a3bdaac03fd9d2e3473ff88'
           '30401729386d6f774c6c36ab8530842166de54a8'
           '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'