Date: Sunday, July 28, 2013 @ 04:54:43 Author: bisson Revision: 191618
archrelease: copy trunk to extra-any Added: meld/repos/extra-any/PKGBUILD (from rev 191617, meld/trunk/PKGBUILD) meld/repos/extra-any/meld.install (from rev 191617, meld/trunk/meld.install) Deleted: meld/repos/extra-any/PKGBUILD meld/repos/extra-any/meld.install --------------+ PKGBUILD | 73 ++++++++++++++++++++++++++++----------------------------- meld.install | 26 ++++++++++---------- 2 files changed, 50 insertions(+), 49 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-07-28 02:54:08 UTC (rev 191617) +++ PKGBUILD 2013-07-28 02:54:43 UTC (rev 191618) @@ -1,36 +0,0 @@ -# $Id$ -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Douglas Soares de Andrade <doug...@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 -} Copied: meld/repos/extra-any/PKGBUILD (from rev 191617, meld/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-07-28 02:54:43 UTC (rev 191618) @@ -0,0 +1,37 @@ +# $Id$ +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Douglas Soares de Andrade <doug...@archlinux.org> + +pkgname=meld +pkgver=1.7.4 +pkgrel=1 +pkgdesc='Visual diff and merge tool' +url='http://meldmerge.org/' +license=('GPL') +arch=('any') +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') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('17c1230512b4b788c4b7b0c6bbd72b10c1005a810c1c9c8db9a0bf1cb1f7d56f') + +install=meld.install +options=('!emptydirs') + +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-07-28 02:54:08 UTC (rev 191617) +++ meld.install 2013-07-28 02:54:43 UTC (rev 191618) @@ -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 191617, meld/trunk/meld.install) =================================================================== --- meld.install (rev 0) +++ meld.install 2013-07-28 02:54:43 UTC (rev 191618) @@ -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 +}