[arch-commits] Commit in lyx/repos/extra-i686 (PKGBUILD lyx.desktop)

[Ronald van Haren]

    Date: Monday, December 29, 2008 @ 08:33:42
  Author: ronald
Revision: 22866

fix svn merge error

Modified:
  lyx/repos/extra-i686/PKGBUILD
  lyx/repos/extra-i686/lyx.desktop

-------------+
 PKGBUILD    |    4 ++--
 lyx.desktop |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-29 13:30:45 UTC (rev 22865)
+++ PKGBUILD	2008-12-29 13:33:42 UTC (rev 22866)
@@ -3,7 +3,7 @@
 # Contributor: Jason Chu <jason at archlinux.org>
 pkgname=lyx
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced open-source document processor."
 arch=(i686 x86_64)
 url='http://www.lyx.org'
@@ -12,7 +12,7 @@
 source=(ftp://ftp.lyx.org/pub/lyx/stable/1.6.x/$pkgname-$pkgver.tar.bz2 \
 	lyx.desktop)
 md5sums=('fdac2fc40b435857afa1089fc04c1fcb'
-         'c94bf402ad980b54bb1c3164b146ee49')
+         'c11db315dc99254a4118827f98922623')
 
 build() {
   cd $srcdir/$pkgname-$pkgver

Modified: lyx.desktop
===================================================================
--- lyx.desktop	2008-12-29 13:30:45 UTC (rev 22865)
+++ lyx.desktop	2008-12-29 13:33:42 UTC (rev 22866)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Lyx
 Comment=Latex WYSIWYM Editor
-Icon=/usr/share/lyx/images/lyx.xpm
+Icon=/usr/share/lyx/images/lyx.png
 Exec=lyx
 Terminal=false
 Type=Application