[arch-commits] Commit in lyx/repos (3 files)

[Ronald van Haren]

    Date: Wednesday, October 22, 2008 @ 16:56:26
  Author: ronald
Revision: 16877

Merged revisions 16872 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/lyx/trunk

........
  r16872 | ronald | 2008-10-22 22:33:11 +0200 (Wed, 22 Oct 2008) | 1 line
  
  upgpkg: lyx 1.5.6-1
........

Added:
  lyx/repos/extra-i686/lyx.desktop
    (from rev 16872, lyx/trunk/lyx.desktop)
Modified:
  lyx/repos/extra-i686/	(properties)
  lyx/repos/extra-i686/PKGBUILD

-------------+
 PKGBUILD    |   24 ++++++++++++++++--------
 lyx.desktop |    9 +++++++++
 2 files changed, 25 insertions(+), 8 deletions(-)


Property changes on: lyx/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /lyx/trunk:1-2081
   + /lyx/trunk:1-16876

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-22 20:42:12 UTC (rev 16876)
+++ extra-i686/PKGBUILD	2008-10-22 20:56:26 UTC (rev 16877)
@@ -1,20 +1,28 @@
 # $Id$
-# Maintainer: Jason Chu <jason at archlinux.org>
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
 pkgname=lyx
-pkgver=1.5.5
+pkgver=1.5.6
 pkgrel=1
 pkgdesc="An advanced open-source document processor."
 arch=(i686 x86_64)
 url='http://www.lyx.org'
-depends=('qt' 'tetex' 'python' 'perl' 'imagemagick' 'aspell' 'aiksaurus')
-license=('GPL2')
-source=(ftp://ftp.lyx.org/pub/lyx/stable/$pkgname-$pkgver.tar.gz)
-md5sums=('75317d358f68b65e2dd954b7e28ca6d9')
+depends=('qt' 'texlive-core' 'python' 'perl' 'imagemagick' 'aspell' 'aiksaurus')
+license=('GPL')
+source=(ftp://ftp.lyx.org/pub/lyx/stable/$pkgname-$pkgver.tar.gz \
+	lyx.desktop)
+md5sums=('da10641ee8654bb9943b52bcba93a777'
+         'c94bf402ad980b54bb1c3164b146ee49')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
+
   ./configure --prefix=/usr \
     --with-frontend=qt4
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make DESTDIR=$pkgdir install || return 1
+
+  # install desktop entry
+  install -Dm644 $srcdir/lyx.desktop \
+	$pkgdir/usr/share/applications/lyx.desktop || return 1
 }

Copied: lyx/repos/extra-i686/lyx.desktop (from rev 16872, lyx/trunk/lyx.desktop)
===================================================================
--- extra-i686/lyx.desktop	                        (rev 0)
+++ extra-i686/lyx.desktop	2008-10-22 20:56:26 UTC (rev 16877)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Lyx
+Comment=Latex WYSIWYM Editor
+Icon=/usr/share/lyx/images/lyx.xpm
+Exec=lyx
+Terminal=false
+Type=Application
+StartupNotify=false
+Categories=Office;