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

Conflicts:
	community-staging/hedgewars/PKGBUILD
	community-testing/alex/PKGBUILD
	community-testing/gtk2hs-buildtools/PKGBUILD
	community-testing/haddock/PKGBUILD
	community-testing/happy/PKGBUILD
	community-testing/haskell-bytestring-show/PKGBUILD
	community-testing/haskell-cairo/PKGBUILD
	community-testing/haskell-dataenc/PKGBUILD
	community-testing/haskell-ghc-paths/PKGBUILD
	community-testing/haskell-glib/PKGBUILD
	community-testing/haskell-gtk/PKGBUILD
	community-testing/haskell-haskeline/PKGBUILD
	community-testing/haskell-hslogger/PKGBUILD
	community-testing/haskell-html/PKGBUILD
	community-testing/haskell-pango/PKGBUILD
	community-testing/haskell-quickcheck/PKGBUILD
	community-testing/haskell-regex-base/PKGBUILD
	community-testing/haskell-regex-compat/PKGBUILD
	community-testing/haskell-regex-posix/PKGBUILD
	community-testing/haskell-stm/PKGBUILD
	community-testing/haskell-syb/PKGBUILD
	community-testing/haskell-tar/PKGBUILD
	community-testing/haskell-terminfo/PKGBUILD
	community-testing/haskell-utf8-string/PKGBUILD
	community-testing/haskell-x11-xft/PKGBUILD
	community-testing/haskell-x11/PKGBUILD
	community-testing/haskell-xhtml/PKGBUILD
	community-testing/hedgewars/PKGBUILD
	community-testing/xmobar/PKGBUILD
	community-testing/xmonad-contrib/PKGBUILD
	community-testing/xmonad/PKGBUILD
	community/osdbattery/PKGBUILD
	community/packeth/PKGBUILD
	extra/kdenetwork/PKGBUILD
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/libgweather/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	staging/kdebindings-python/PKGBUILD
	staging/mesa/PKGBUILD
	testing/btrfs-progs/PKGBUILD
	testing/btrfs-progs/initcpio-install-btrfs
	testing/ghc/PKGBUILD
	testing/ghc/build.mk
	testing/haskell-http/PKGBUILD
	testing/haskell-mtl/PKGBUILD
	testing/haskell-network/PKGBUILD
	testing/haskell-parsec/PKGBUILD
	testing/haskell-random/PKGBUILD
	testing/haskell-text/PKGBUILD
	testing/haskell-transformers/PKGBUILD
	testing/haskell-zlib/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/libkcddb/PKGBUILD
	testing/libkcompactdisc/PKGBUILD
	testing/libkdcraw/PKGBUILD
	testing/libkdeedu/PKGBUILD
	testing/libkexiv2/PKGBUILD
	testing/libkipi/PKGBUILD
	testing/libksane/PKGBUILD
	testing/nepomuk-core/PKGBUILD
	testing/systemd/PKGBUILD
	testing/systemd/initcpio-install-udev
	testing/util-linux/PKGBUILD
	testing/util-linux/util-linux.install

2 files changed, 30 insertions, 14 deletions

diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD
index aa8881be8..556b94758 100644
--- a/extra/kdegames/PKGBUILD
+++ b/extra/kdegames/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166259 2012-09-05 18:32:27Z andrea $
+# $Id: PKGBUILD 167822 2012-10-03 14:44:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -9,7 +9,6 @@ pkgname=('kdegames-bomber'
          'kdegames-kajongg'
          'kdegames-kapman'
          'kdegames-katomic'
-         'kdegames-kbattleship'
          'kdegames-kblackbox'
          'kdegames-kblocks'
          'kdegames-kbounce'
@@ -25,6 +24,7 @@ pkgname=('kdegames-bomber'
          'kdegames-klickety'
          'kdegames-kmahjongg'
          'kdegames-kmines'
+         'kdegames-knavalbattle'
          'kdegames-knetwalk'
          'kdegames-kolf'
          'kdegames-kollision'
@@ -33,17 +33,17 @@ pkgname=('kdegames-bomber'
          'kdegames-kreversi'
          'kdegames-kshisen'
          'kdegames-ksirk'
+         'kdegames-ksnakeduel'
          'kdegames-kspaceduel'
          'kdegames-ksquares'
          'kdegames-ksudoku'
-         'kdegames-ktron'
          'kdegames-ktuberling'
          'kdegames-kubrick'
          'kdegames-libkdegames'
          'kdegames-libkmahjongg'
          'kdegames-lskat'
          'kdegames-palapeli')
-pkgver=4.9.1
+pkgver=4.9.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -52,7 +52,7 @@ groups=('kde' 'kdegames')
 makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2'
              'openal')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('5fc77f230cff0a9b243403affc176e4e4757a1e7')
+sha1sums=('a751f6b9ed6c24f8a420d6737be87f2bbb0c2cb3')
 
 build() {
 	cd $srcdir
@@ -123,12 +123,14 @@ package_kdegames-katomic() {
 	make DESTDIR=$pkgdir install
 }
 
-package_kdegames-kbattleship() {
-	pkgdesc='Battleship Game'
+package_kdegames-knavalbattle() {
+	pkgdesc='Naval Battle'
 	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kbattleship/"
-	install='kdegames-kbattleship.install'
-	cd $srcdir/build/kbattleship
+	url="http://kde.org/applications/games/knavalbattle/"
+	install='kdegames-knavalbattle.install'
+    replaces=('kdegames-kbattleship')
+    conflicts=('kdegames-kbattleship')
+    cd $srcdir/build/knavalbattle
 	make DESTDIR=$pkgdir install
 }
 
@@ -369,12 +371,14 @@ package_kdegames-ksudoku() {
 	make DESTDIR=$pkgdir install
 }
 
-package_kdegames-ktron() {
-	pkgdesc='Tron-like Game'
+package_kdegames-ksnakeduel() {
+	pkgdesc='Snake-like Game'
 	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ktron/"
+	url="http://kde.org/applications/games/ksnakeduel/"
 	install='kdegames.install'
-	cd $srcdir/build/ktron
+    replaces=('kdegames-ktron')
+    conflicts=('kdegames-ktron')
+	cd $srcdir/build/ksnakeduel
 	make DESTDIR=$pkgdir install
 }
 
diff --git a/extra/kdegames/kdegames-knavalbattle.install b/extra/kdegames/kdegames-knavalbattle.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/extra/kdegames/kdegames-knavalbattle.install
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}