Date: Saturday, April 28, 2012 @ 09:00:14 Author: ibiru Revision: 157447
archrelease: copy trunk to extra-any Added: meld/repos/extra-any/PKGBUILD (from rev 157446, meld/trunk/PKGBUILD) meld/repos/extra-any/meld.install (from rev 157446, meld/trunk/meld.install) Deleted: meld/repos/extra-any/PKGBUILD meld/repos/extra-any/meld.install --------------+ PKGBUILD | 58 ++++++++++++++++++++++++++++----------------------------- meld.install | 22 ++++++++++----------- 2 files changed, 40 insertions(+), 40 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-04-28 12:36:41 UTC (rev 157446) +++ PKGBUILD 2012-04-28 13:00:14 UTC (rev 157447) @@ -1,29 +0,0 @@ -# $Id$ -# Contributor: Douglas Soares de Andrade <doug...@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1...@archlinux.us> - -pkgname=meld -pkgver=1.5.4 -pkgrel=1 -pkgdesc='Visual diff and merge tool' -arch=('any') -url='http://meld.sourceforge.net/' -license=('GPL') -depends=('pygtk') -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=('fc6e78dc8cdcff34d14403b1b45dbdf5a8d480e889602cddc0df342b34266612') - -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 157446, meld/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-04-28 13:00:14 UTC (rev 157447) @@ -0,0 +1,29 @@ +# $Id$ +# Contributor: Douglas Soares de Andrade <doug...@archlinux.org> +# Maintainer: Daniel J Griffiths <ghost1...@archlinux.us> + +pkgname=meld +pkgver=1.6.0 +pkgrel=1 +pkgdesc='Visual diff and merge tool' +arch=('any') +url='http://meld.sourceforge.net/' +license=('GPL') +depends=('pygtk') +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=('a0ec4e19e85ea4df0214da4c92a4069095d37a252ab240fc1bc00f29a627fea8') + +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" +} Deleted: meld.install =================================================================== --- meld.install 2012-04-28 12:36:41 UTC (rev 157446) +++ meld.install 2012-04-28 13:00:14 UTC (rev 157447) @@ -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 157446, meld/trunk/meld.install) =================================================================== --- meld.install (rev 0) +++ meld.install 2012-04-28 13:00:14 UTC (rev 157447) @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}