[arch-commits] Commit in stellarium/repos (5 files)

[Ronald van Haren]

    Date: Wednesday, September 24, 2008 @ 17:31:15
  Author: ronald
Revision: 12923

fix svn merge conflict

Added:
  stellarium/repos/extra-i686/stellarium.desktop
    (from rev 12921, stellarium/trunk/stellarium.desktop)
  stellarium/repos/extra-i686/stellarium.install
    (from rev 12921, stellarium/trunk/stellarium.install)
  stellarium/repos/extra-i686/stellarium.png
    (from rev 12921, stellarium/trunk/stellarium.png)
Modified:
  stellarium/repos/extra-i686/	(properties)
  stellarium/repos/extra-i686/PKGBUILD

--------------------+
 PKGBUILD           |   28 +++++++++++++++++++---------
 stellarium.desktop |   11 +++++++++++
 stellarium.install |   18 ++++++++++++++++++
 3 files changed, 48 insertions(+), 9 deletions(-)


Property changes on: stellarium/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /stellarium/trunk:1
   + /stellarium/trunk:1-12922

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-24 21:22:56 UTC (rev 12922)
+++ extra-i686/PKGBUILD	2008-09-24 21:31:15 UTC (rev 12923)
@@ -1,22 +1,32 @@
 # $Id$
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-# Maintainer: damir <damir at archlinux.org>
 
 pkgname=stellarium
-pkgver=0.9.1
-pkgrel=2
+pkgver=0.10.0
+pkgrel=1
 pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
 arch=("i686" "x86_64")
 url="http://stellarium.free.fr/"
 license=('GPL2')
-depends=('libpng' 'mesa' 'sdl_mixer' 'libgl' 'freetype2' 'curl' 'qt>=4.3')
+depends=('libpng' 'mesa' 'sdl_mixer' 'libgl' 'freetype2' 'curl' 'qt>=4.4.2')
 makedepends=('cmake' 'boost')
-source=("http://puzzle.dl.sourceforge.net/sourceforge/stellarium/$pkgname-$pkgver.tar.gz")
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tgz" \
+	'stellarium.desktop' 'stellarium.png')
+install=stellarium.install
+md5sums=('09465fa11a8caab7a4410f1e5ff6eb8c'
+         'd119a2f0fc23eebb440697ed0f759fea'
+         '134ab08e73f4f5d995a7931a7957b7a3')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr || return 1
+  cd $srcdir/$pkgname-$pkgver
+  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install
+
+# install desktop file & pixmap
+install -Dm644 $srcdir/stellarium.desktop \
+	$pkgdir/usr/share/applications/stellarium.desktop
+install -Dm644 $srcdir/stellarium.png \
+	$pkgdir/usr/share/pixmaps/stellarium.png
 }
-md5sums=('d0d55cb1ff5acd08a4d3b27d953579c0')

Copied: stellarium/repos/extra-i686/stellarium.desktop (from rev 12921, stellarium/trunk/stellarium.desktop)
===================================================================
--- extra-i686/stellarium.desktop	                        (rev 0)
+++ extra-i686/stellarium.desktop	2008-09-24 21:31:15 UTC (rev 12923)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Stellarium nightsky renderer
+GenericName=Nightsky renderer
+Comment=A real-time nightsky renderer
+Categories=Education;Science;Astronomy;
+Icon=/usr/share/pixmaps/stellarium.png
+Exec=stellarium
+Terminal=false
+Type=Application
+Encoding=UTF-8
+

Copied: stellarium/repos/extra-i686/stellarium.install (from rev 12921, stellarium/trunk/stellarium.install)
===================================================================
--- extra-i686/stellarium.install	                        (rev 0)
+++ extra-i686/stellarium.install	2008-09-24 21:31:15 UTC (rev 12923)
@@ -0,0 +1,18 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  update-desktop-database -q
+}
+
+op=$1
+shift
+
+$op $*
+
+

Copied: stellarium/repos/extra-i686/stellarium.png (from rev 12921, stellarium/trunk/stellarium.png)
===================================================================
(Binary files differ)