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

Conflicts:
	community/dwdiff/PKGBUILD
	community/ejabberd/PKGBUILD
	community/gnome-settings-daemon-updates/PKGBUILD
	community/gpicview/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/mapnik/PKGBUILD
	community/mplayer2/PKGBUILD
	community/open-vm-tools/PKGBUILD
	community/vdrift/PKGBUILD
	community/xboard/PKGBUILD
	core/openssh/PKGBUILD
	extra/boost/PKGBUILD
	extra/dconf/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/gconf/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-disk-utility/PKGBUILD
	extra/gnome-menus/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-themes-standard/PKGBUILD
	extra/gobject-introspection/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgsf/PKGBUILD
	extra/libimobiledevice/PKGBUILD
	extra/libplist/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/pango/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/telepathy-kde-accounts-kcm/PKGBUILD
	extra/telepathy-kde-approver/PKGBUILD
	extra/telepathy-kde-auth-handler/PKGBUILD
	extra/telepathy-kde-contact-list/PKGBUILD
	extra/telepathy-kde-filetransfer-handler/PKGBUILD
	extra/telepathy-kde-integration-module/PKGBUILD
	extra/telepathy-kde-send-file/PKGBUILD
	extra/telepathy-kde-text-ui/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/yelp/PKGBUILD
	libre/unarchiver/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	testing/binutils/PKGBUILD

2 files changed, 20 insertions, 14 deletions

diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index f084b5547..cdc371a1d 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 66108 2012-02-23 01:07:34Z spupykin $
+# $Id: PKGBUILD 69790 2012-04-23 09:38:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xboard
-pkgver=4.5.2
-pkgrel=4
-pkgdesc="A graphical user interfaces for chess"
+pkgver=4.6.2
+pkgrel=1
+pkgdesc="Graphical user interfaces for chess"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/xboard/"
 license=('GPL3')
 depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils'
 	 'xorg-fonts-75dpi' 'xorg-fonts-100dpi')
+makedepends=('gendesk')
 install=${pkgname}.install
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        'xboard.desktop')
-md5sums=('2fa92fceeda344ef935bc97bef5f9fc5'
-         '1d9d4a7864465a703fe4a215e83f4806')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('6e6d119fac60d68139d7836426212efb')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"
+  gendesk
+
+  cd "${pkgname}-${pkgver}"
   sed -i 's/fairymax/gnuchess/g' xboard.h xboard.conf.in
   ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc
   make
@@ -27,7 +29,10 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   make DESTDIR="${pkgdir}" install
   install -Dm644 ${srcdir}/${pkgname}.desktop \
     ${pkgdir}/usr/share/applications/${pkgname}.desktop
+  install -Dm644 ${srcdir}/${pkgname}.png \
+    ${pkgdir}/usr/share/pixmaps/${pkgname}.png
 }
diff --git a/community/xboard/xboard.desktop b/community/xboard/xboard.desktop
index ff79ab684..4bdfdbe15 100644
--- a/community/xboard/xboard.desktop
+++ b/community/xboard/xboard.desktop
@@ -1,9 +1,10 @@
 [Desktop Entry]
+Encoding=UTF-8
 Type=Application
-Version=1.0
-Name=XBoard
-Comment=An X Window System graphical chessboard
+Name=Xboard
+Comment=A graphical user interfaces for chess
 Exec=xboard
-Icon=xboard
+Icon=xboard.png
 Terminal=false
-Categories=Game;BoardGame
+StartupNotify=false
+Categories=Application;