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

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

4 files changed, 11 insertions, 14 deletions

diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index cdcd4c69c..9a6a8a2c1 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 81737 2012-12-28 00:16:43Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 85462 2013-03-01 21:26:53Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=rxvt-unicode
-pkgver=9.16
+pkgver=9.17
 pkgrel=1
 pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,10 +19,10 @@ source=(
   'urxvtc.desktop'
   'urxvt-tabbed.desktop'
 )
-md5sums=('2e2942e8367624affebc0568e3671b66'
-         '88d8786d74b819450adf722180db09fd'
-         'bebf5b6b399b74b557fcedbdb47cc387'
-         '2604896bb107fbb5511bfd6f46d65894')
+md5sums=('1270432bdc7ce17dbb07d41a607081e0'
+         'c2b828d37d06cbf4c32937a2959f2fc2'
+         '10e80aebaef042fb63d2585440dc3637'
+         '830abe6f31fb926a1bcd2650731be15e')
 
 build() {
   cd $pkgname-$pkgver
@@ -73,4 +73,4 @@ package() {
   done
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/rxvt-unicode/urxvt-tabbed.desktop b/community/rxvt-unicode/urxvt-tabbed.desktop
index f3efdc9b9..bd48c0a72 100644
--- a/community/rxvt-unicode/urxvt-tabbed.desktop
+++ b/community/rxvt-unicode/urxvt-tabbed.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=urxvt (tabbed)
 Comment=An unicode capable and tabbed rxvt clone
 Exec=urxvt-tabbed
 Icon=terminal
 Terminal=false
 Type=Application
-Categories=Application;System;TerminalEmulator;
+Categories=System;TerminalEmulator;
diff --git a/community/rxvt-unicode/urxvt.desktop b/community/rxvt-unicode/urxvt.desktop
index 0a9baf7df..d90c182e2 100644
--- a/community/rxvt-unicode/urxvt.desktop
+++ b/community/rxvt-unicode/urxvt.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=urxvt
 Comment=An unicode capable rxvt clone
 Exec=urxvt
 Icon=terminal
 Terminal=false
 Type=Application
-Categories=Application;System;TerminalEmulator;
+Categories=System;TerminalEmulator;
diff --git a/community/rxvt-unicode/urxvtc.desktop b/community/rxvt-unicode/urxvtc.desktop
index e39a418f6..67751095b 100644
--- a/community/rxvt-unicode/urxvtc.desktop
+++ b/community/rxvt-unicode/urxvtc.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 Name=urxvt (client)
 Comment=An unicode capable rxvt clone client for urxvtd
 Exec=urxvtc
 Icon=terminal
 Terminal=false
 Type=Application
-Categories=Application;System;TerminalEmulator;
+Categories=System;TerminalEmulator;