[arch-commits] Commit in emacs/trunk (PKGBUILD emacs.desktop)

[Andrea Scarpino]

    Date: Tuesday, October 25, 2011 @ 16:28:56
  Author: andrea
Revision: 141196

Upstream already ships desktop file and icon

Modified:
  emacs/trunk/PKGBUILD
Deleted:
  emacs/trunk/emacs.desktop

---------------+
 PKGBUILD      |   11 +++--------
 emacs.desktop |   12 ------------
 2 files changed, 3 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-25 19:20:53 UTC (rev 141195)
+++ PKGBUILD	2011-10-25 20:28:56 UTC (rev 141196)
@@ -1,6 +1,7 @@
 # $Id$
 # Maintainer: Juergen Hoetzel <juergen at archlinux.org>
 # Contributor: Renchi Raju <renchi at green.tam.uiuc.edu>
+
 pkgname=emacs
 _majorver=23.3
 _minorver=a
@@ -15,9 +16,8 @@
 license=('GPL3')
 depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk2' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib')
 install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop)
-md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
-         '8af038d2ba4561271e935bb444ceb4e3')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz)
+md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04')
 
 build() {
   cd "$srcdir"/$pkgname-$_majorver
@@ -42,9 +42,4 @@
   chmod 775 "$pkgdir"/var/games/emacs
   chmod 664 "$pkgdir"/var/games/emacs/*
   chown -R root:games "$pkgdir"/var/games
-
-  # fix  FS#9253
-  mkdir -p "$pkgdir"/usr/share/pixmaps "$pkgdir"/usr/share/applications
-  install -D -m644 "$srcdir"/$pkgname.desktop   "$pkgdir"/usr/share/applications
-  ln -s  ../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png
 }

Deleted: emacs.desktop
===================================================================
--- emacs.desktop	2011-10-25 19:20:53 UTC (rev 141195)
+++ emacs.desktop	2011-10-25 20:28:56 UTC (rev 141196)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Emacs Text Editor
-Name[de]=Emacs Texteditor
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=emacs %f
-Icon=emacs-icon
-Type=Application
-Terminal=false
-Categories=Development;TextEditor;
-StartupWMClass=Emacs