Date: Sunday, September 1, 2013 @ 06:17:38 Author: bisson Revision: 193791
archrelease: copy trunk to extra-any Added: meld/repos/extra-any/PKGBUILD (from rev 193790, meld/trunk/PKGBUILD) meld/repos/extra-any/install (from rev 193790, meld/trunk/install) Deleted: meld/repos/extra-any/PKGBUILD meld/repos/extra-any/meld.install --------------+ PKGBUILD | 75 ++++++++++++++++++++++++++++----------------------------- install | 13 +++++++++ meld.install | 13 --------- 3 files changed, 51 insertions(+), 50 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2013-09-01 04:16:55 UTC (rev 193790) +++ PKGBUILD 2013-09-01 04:17:38 UTC (rev 193791) @@ -1,37 +0,0 @@ -# $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 -} Copied: meld/repos/extra-any/PKGBUILD (from rev 193790, meld/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2013-09-01 04:17:38 UTC (rev 193791) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Douglas Soares de Andrade <doug...@archlinux.org> + +pkgname=meld +pkgver=1.7.5 +pkgrel=1 +pkgdesc='Visual diff and merge tool' +url='http://meldmerge.org/' +license=('GPL') +arch=('any') +makedepends=('intltool' 'gnome-doc-utils') +depends=('pygtk' 'hicolor-icon-theme' 'desktop-file-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") +sha1sums=('13be80b0f3487870315f66ce376ccca35c22b786') + +install=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 +} Copied: meld/repos/extra-any/install (from rev 193790, meld/trunk/install) =================================================================== --- install (rev 0) +++ install 2013-09-01 04:17:38 UTC (rev 193791) @@ -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 +} Deleted: meld.install =================================================================== --- meld.install 2013-09-01 04:16:55 UTC (rev 193790) +++ meld.install 2013-09-01 04:17:38 UTC (rev 193791) @@ -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 -}