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

[Jan Steffens]

    Date: Tuesday, June 4, 2013 @ 06:33:17
  Author: heftig
Revision: 187113

archrelease: copy trunk to extra-any

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

--------------+
 PKGBUILD     |   71 ++++++++++++++++++++++++++++-----------------------------
 meld.install |   26 ++++++++++----------
 2 files changed, 49 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-04 04:32:39 UTC (rev 187112)
+++ PKGBUILD	2013-06-04 04:33:17 UTC (rev 187113)
@@ -1,35 +0,0 @@
-# $Id$
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=meld
-pkgver=1.7.2
-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'
-            'python2-dbus: open a new tab in an already running instance'
-            'python2-gconf: gnome integration')
-install=meld.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ece1f086f0c23395060abcdca03795e739e072d5032aac8a9a1fb1502c806e9f')
-
-prepare() {
-  cd $pkgname-$pkgver
-  sed -i 's/update-/#update-/' Makefile
-  sed -i 's/env python/env python2/' bin/meld
-}
-
-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
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 187112, meld/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-06-04 04:33:17 UTC (rev 187113)
@@ -0,0 +1,36 @@
+# $Id$
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+
+pkgname=meld
+pkgver=1.7.3
+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'
+            'python2-dbus: open a new tab in an already running instance'
+            'python2-gconf: gnome integration')
+install=meld.install
+options=('!emptydirs')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('752eeb3908af23320a11ecbd27a72ac67f381dabd4c52ca7e0c86f9dda74718f')
+
+prepare() {
+  cd $pkgname-$pkgver
+  sed -i 's/update-/#update-/' Makefile
+  sed -i 's/env python/env python2/' bin/meld
+}
+
+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
+}

Deleted: meld.install
===================================================================
--- meld.install	2013-06-04 04:32:39 UTC (rev 187112)
+++ meld.install	2013-06-04 04:33:17 UTC (rev 187113)
@@ -1,13 +0,0 @@
-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
-}

Copied: meld/repos/extra-any/meld.install (from rev 187112, meld/trunk/meld.install)
===================================================================
--- meld.install	                        (rev 0)
+++ meld.install	2013-06-04 04:33:17 UTC (rev 187113)
@@ -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
+}