Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/mlt/PKGBUILD
	community/haskell-dataenc/PKGBUILD
	community/haskell-ghc-paths/PKGBUILD
	community/haskell-haskeline/PKGBUILD
	community/haskell-hslogger/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/haskell-terminfo/PKGBUILD
	community/haskell-utf8-string/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/xmonad/PKGBUILD
	extra/cabal-install/PKGBUILD
	extra/cups/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-parsec/PKGBUILD
	extra/haskell-text/PKGBUILD
	extra/haskell-transformers/PKGBUILD
	extra/haskell-zlib/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/swt/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD
	testing/dbus-core/PKGBUILD
	testing/dbus-core/dbus.install

1 files changed, 5 insertions, 4 deletions

diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD
index dc704b888..fbcf5573f 100644
--- a/community/vidalia/PKGBUILD
+++ b/community/vidalia/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64515 2012-02-15 15:45:44Z tredaelli $
+# $Id: PKGBUILD 72377 2012-06-13 10:27:38Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Rorschach <r0rschach@lavabit.com>
 
 pkgname=vidalia
-pkgver=0.2.17
+pkgver=0.2.19
 pkgrel=1
 pkgdesc="Controller GUI for Tor"
 url="https://www.torproject.org/vidalia"
@@ -12,8 +12,9 @@ license=('GPL')
 depends=('qt' 'tor')
 makedepends=('cmake')
 install=vidalia.install
-source=("https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz")
-md5sums=(dcfd49e7f2ff73702e6007091cbe33d6)
+source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('caf92b44ad2932bbc1c40d6405951c39'
+         '1ba45d7c91797e880d79a3fc85818dee')
 
 build() {
   [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh