[arch-commits] Commit in meld/repos/extra-any (4 files)

[Eric Bélanger]

    Date: Tuesday, March 12, 2013 @ 00:34:58
  Author: eric
Revision: 179920

archrelease: copy trunk to extra-any

Added:
  meld/repos/extra-any/PKGBUILD
    (from rev 179919, meld/trunk/PKGBUILD)
  meld/repos/extra-any/meld.install
    (from rev 179919, meld/trunk/meld.install)
Deleted:
  meld/repos/extra-any/PKGBUILD
  meld/repos/extra-any/meld.install

--------------+
 PKGBUILD     |   59 ++++++++++++++++++++++++++++-----------------------------
 meld.install |   24 ++++++++++++-----------
 2 files changed, 43 insertions(+), 40 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD    2013-03-11 23:34:32 UTC (rev 179919)
+++ PKGBUILD    2013-03-11 23:34:58 UTC (rev 179920)
@@ -1,29 +0,0 @@
-# $Id$
-# Contributor: Douglas Soares de Andrade <doug...@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1...@archlinux.us>
-
-pkgname=meld
-pkgver=1.7.0
-pkgrel=1
-pkgdesc='Visual diff and merge tool'
-arch=('any')
-url='http://meld.sourceforge.net/'
-license=('GPL')
-depends=('pygtk' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('pygtksourceview2: syntax highlighting'
-            'gnome-python: gnome integration')
-install=meld.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d355dba06a39e38ffee93a6b205888db648a0308bc8a5efe3a9c7a42ed91370b')
-
-build() {
-    cd $pkgname-$pkgver
-    make PYTHON=/usr/bin/python2 prefix=/usr
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="$pkgdir" install
-    sed -i -e 's#env python#env python2#' "$pkgdir/usr/bin/meld"
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 179919, meld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD                            (rev 0)
+++ PKGBUILD    2013-03-11 23:34:58 UTC (rev 179920)
@@ -0,0 +1,30 @@
+# $Id$
+# Contributor: Douglas Soares de Andrade <doug...@archlinux.org>
+# Maintainer: Daniel J Griffiths <ghost1...@archlinux.us>
+
+pkgname=meld
+pkgver=1.7.1
+pkgrel=1
+pkgdesc='Visual diff and merge tool'
+arch=('any')
+url='http://meldmerge.org/'
+license=('GPL')
+depends=('pygtk' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('intltool' 'gnome-doc-utils')
+optdepends=('pygtksourceview2: syntax highlighting'
+            'gnome-python: gnome integration')
+install=meld.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c5dc21d32405a520cc7969f4de9e2ea356cb0e950fc5a20a9053230313ff3a40')
+
+build() {
+    cd $pkgname-$pkgver
+    sed -i 's/update-/#update-/' Makefile
+    make PYTHON=/usr/bin/python2 prefix=/usr
+}
+
+package() {
+    cd $pkgname-$pkgver
+    make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="$pkgdir" install
+    sed -i -e 's#env python#env python2#' "$pkgdir/usr/bin/meld"
+}

Deleted: meld.install
===================================================================
--- meld.install        2013-03-11 23:34:32 UTC (rev 179919)
+++ meld.install        2013-03-11 23:34:58 UTC (rev 179920)
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: meld/repos/extra-any/meld.install (from rev 179919, 
meld/trunk/meld.install)
===================================================================
--- meld.install                                (rev 0)
+++ meld.install        2013-03-11 23:34:58 UTC (rev 179920)
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}