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

2015-12-09 Thread Jan Steffens
Date: Wednesday, December 9, 2015 @ 22:05:08
  Author: heftig
Revision: 255033

archrelease: copy trunk to extra-any

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

--+
 PKGBUILD |   78 -
 meld.install |   28 ++--
 2 files changed, 53 insertions(+), 53 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-12-09 21:04:33 UTC (rev 255032)
+++ PKGBUILD2015-12-09 21:05:08 UTC (rev 255033)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) 
-# Contributor: Gaetan Bisson 
-# Contributor: Daniel J Griffiths 
-# Contributor: Douglas Soares de Andrade 
-
-pkgname=meld
-pkgver=3.14.1
-pkgrel=3
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=(GPL)
-arch=(any)
-makedepends=(intltool itstool)
-install=meld.install
-depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme 
desktop-file-utils
- gsettings-desktop-schemas)
-optdepends=('python2-dbus: open a new tab in an already running instance')
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
-sha1sums=('a2db7e96bbd99dc038de22fb5e5a0f94668b76c1')
-
-# Meld does not support Python 3. The build succeeds, but
-# the main executable checks the version and errors out.
-
-prepare() {
-  cd $pkgname-$pkgver
-}
-
-build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $pkgname-$pkgver
-  # using --skip-build breaks install
-  python2 setup.py --no-update-icon-cache --no-compile-schemas \
-install --prefix=/usr --root="$pkgdir" --optimize=1
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 255032, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-12-09 21:05:08 UTC (rev 255033)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) 
+# Contributor: Gaetan Bisson 
+# Contributor: Daniel J Griffiths 
+# Contributor: Douglas Soares de Andrade 
+
+pkgname=meld
+pkgver=3.14.2
+pkgrel=1
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme 
desktop-file-utils
+ gsettings-desktop-schemas)
+optdepends=('python2-dbus: open a new tab in an already running instance')
+source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
+sha1sums=('2339e0cec3b1859038f4272de018c95d6e54c4af')
+
+# Meld does not support Python 3. The build succeeds, but
+# the main executable checks the version and errors out.
+
+prepare() {
+  cd $pkgname-$pkgver
+}
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  # using --skip-build breaks install
+  python2 setup.py --no-update-icon-cache --no-compile-schemas \
+install --prefix=/usr --root="$pkgdir" --optimize=1
+}

Deleted: meld.install
===
--- meld.install2015-12-09 21:04:33 UTC (rev 255032)
+++ meld.install2015-12-09 21:05:08 UTC (rev 255033)
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  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 255032, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2015-12-09 21:05:08 UTC (rev 255033)
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}


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

2015-01-01 Thread Jan Steffens
Date: Thursday, January 1, 2015 @ 12:29:49
  Author: heftig
Revision: 228324

archrelease: copy trunk to extra-any

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

--+
 PKGBUILD |   70 -
 meld.install |   28 +++---
 2 files changed, 49 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2015-01-01 11:28:08 UTC (rev 228323)
+++ PKGBUILD2015-01-01 11:29:49 UTC (rev 228324)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Gaetan Bisson bis...@archlinux.org
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=meld
-pkgver=3.12.2
-pkgrel=1
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=(GPL)
-arch=(any)
-makedepends=(intltool itstool)
-install=meld.install
-depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme 
desktop-file-utils
- gsettings-desktop-schemas)
-optdepends=('python2-dbus: open a new tab in an already running instance')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
-sha1sums=('693ae87bcd0080d938d16197c3d46ffe1a4de42d')
-
-# Meld does not support Python 3. The build succeeds, but
-# the main executable checks the version and errors out.
-
-build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $pkgname-$pkgver
-  # using --skip-build breaks install
-  python2 setup.py --no-update-icon-cache --no-compile-schemas \
-install --prefix=/usr --root=$pkgdir --optimize=1
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 228323, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2015-01-01 11:29:49 UTC (rev 228324)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Gaetan Bisson bis...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=meld
+pkgver=3.12.3
+pkgrel=1
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme 
desktop-file-utils
+ gsettings-desktop-schemas)
+optdepends=('python2-dbus: open a new tab in an already running instance')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
+sha1sums=('01d742bf5a12879bc1591110f3ee90496195b76b')
+
+# Meld does not support Python 3. The build succeeds, but
+# the main executable checks the version and errors out.
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  # using --skip-build breaks install
+  python2 setup.py --no-update-icon-cache --no-compile-schemas \
+install --prefix=/usr --root=$pkgdir --optimize=1
+}

Deleted: meld.install
===
--- meld.install2015-01-01 11:28:08 UTC (rev 228323)
+++ meld.install2015-01-01 11:29:49 UTC (rev 228324)
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  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 228323, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2015-01-01 11:29:49 UTC (rev 228324)
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  update-mime-database usr/share/mime  /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}


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

2014-11-30 Thread Jan Steffens
Date: Monday, December 1, 2014 @ 06:15:45
  Author: heftig
Revision: 227225

archrelease: copy trunk to extra-any

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

--+
 PKGBUILD |   70 -
 meld.install |   28 +++---
 2 files changed, 49 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-12-01 05:15:01 UTC (rev 227224)
+++ PKGBUILD2014-12-01 05:15:45 UTC (rev 227225)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Gaetan Bisson bis...@archlinux.org
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=meld
-pkgver=3.12.1
-pkgrel=1
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=(GPL)
-arch=(any)
-makedepends=(intltool itstool)
-install=meld.install
-depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme 
desktop-file-utils
- gsettings-desktop-schemas)
-optdepends=('python2-dbus: open a new tab in an already running instance')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
-sha1sums=('c46ecab903bad2ece5c5031a624b545c7dcdb486')
-
-# Meld does not support Python 3. The build succeeds, but
-# the main executable checks the version and errors out.
-
-build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $pkgname-$pkgver
-  # using --skip-build breaks install
-  python2 setup.py --no-update-icon-cache --no-compile-schemas \
-install --prefix=/usr --root=$pkgdir --optimize=1
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 227224, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-12-01 05:15:45 UTC (rev 227225)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Gaetan Bisson bis...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=meld
+pkgver=3.12.2
+pkgrel=1
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme 
desktop-file-utils
+ gsettings-desktop-schemas)
+optdepends=('python2-dbus: open a new tab in an already running instance')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
+sha1sums=('693ae87bcd0080d938d16197c3d46ffe1a4de42d')
+
+# Meld does not support Python 3. The build succeeds, but
+# the main executable checks the version and errors out.
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  # using --skip-build breaks install
+  python2 setup.py --no-update-icon-cache --no-compile-schemas \
+install --prefix=/usr --root=$pkgdir --optimize=1
+}

Deleted: meld.install
===
--- meld.install2014-12-01 05:15:01 UTC (rev 227224)
+++ meld.install2014-12-01 05:15:45 UTC (rev 227225)
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  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 227224, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2014-12-01 05:15:45 UTC (rev 227225)
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  update-mime-database usr/share/mime  /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}


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

2014-10-25 Thread Jan Steffens
Date: Sunday, October 26, 2014 @ 02:04:17
  Author: heftig
Revision: 225346

archrelease: copy trunk to extra-any

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

--+
 PKGBUILD |   70 -
 meld.install |   28 +++---
 2 files changed, 49 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-10-26 00:03:52 UTC (rev 225345)
+++ PKGBUILD2014-10-26 00:04:17 UTC (rev 225346)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Gaetan Bisson bis...@archlinux.org
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=meld
-pkgver=3.12.0
-pkgrel=1
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=(GPL)
-arch=(any)
-makedepends=(intltool itstool)
-install=meld.install
-depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme 
desktop-file-utils
- gsettings-desktop-schemas)
-optdepends=('python2-dbus: open a new tab in an already running instance')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
-sha1sums=('1481f453463da29357953933362cccfa336313bd')
-
-# Meld does not support Python 3. The build succeeds, but
-# the main executable checks the version and errors out.
-
-build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $pkgname-$pkgver
-  # using --skip-build breaks install
-  python2 setup.py --no-update-icon-cache --no-compile-schemas \
-install --prefix=/usr --root=$pkgdir --optimize=1
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 225345, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-10-26 00:04:17 UTC (rev 225346)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Gaetan Bisson bis...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=meld
+pkgver=3.12.1
+pkgrel=1
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme 
desktop-file-utils
+ gsettings-desktop-schemas)
+optdepends=('python2-dbus: open a new tab in an already running instance')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
+sha1sums=('c46ecab903bad2ece5c5031a624b545c7dcdb486')
+
+# Meld does not support Python 3. The build succeeds, but
+# the main executable checks the version and errors out.
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  # using --skip-build breaks install
+  python2 setup.py --no-update-icon-cache --no-compile-schemas \
+install --prefix=/usr --root=$pkgdir --optimize=1
+}

Deleted: meld.install
===
--- meld.install2014-10-26 00:03:52 UTC (rev 225345)
+++ meld.install2014-10-26 00:04:17 UTC (rev 225346)
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  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 225345, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2014-10-26 00:04:17 UTC (rev 225346)
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  update-mime-database usr/share/mime  /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}


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

2014-09-28 Thread Jan Steffens
Date: Sunday, September 28, 2014 @ 22:25:06
  Author: heftig
Revision: 223673

archrelease: copy trunk to extra-any

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

--+
 PKGBUILD |   70 -
 meld.install |   28 +++---
 2 files changed, 49 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-09-28 20:24:31 UTC (rev 223672)
+++ PKGBUILD2014-09-28 20:25:06 UTC (rev 223673)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Gaetan Bisson bis...@archlinux.org
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=meld
-pkgver=3.11.4
-pkgrel=1
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=(GPL)
-arch=(any)
-makedepends=(intltool itstool)
-install=meld.install
-depends=(python2-gobject gtksourceview3 hicolor-icon-theme desktop-file-utils
- gsettings-desktop-schemas)
-optdepends=('python2-dbus: open a new tab in an already running instance')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
-sha1sums=('18ebc2256f84f7083f3135f9422d23a52e336c55')
-
-# Meld does not support Python 3. The build succeeds, but
-# the main executable checks the version and errors out.
-
-build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $pkgname-$pkgver
-  # using --skip-build breaks install
-  python2 setup.py --no-update-icon-cache --no-compile-schemas \
-install --prefix=/usr --root=$pkgdir --optimize=1
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 223672, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-09-28 20:25:06 UTC (rev 223673)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Gaetan Bisson bis...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=meld
+pkgver=3.12.0
+pkgrel=1
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject python2-cairo gtksourceview3 hicolor-icon-theme 
desktop-file-utils
+ gsettings-desktop-schemas)
+optdepends=('python2-dbus: open a new tab in an already running instance')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
+sha1sums=('1481f453463da29357953933362cccfa336313bd')
+
+# Meld does not support Python 3. The build succeeds, but
+# the main executable checks the version and errors out.
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  # using --skip-build breaks install
+  python2 setup.py --no-update-icon-cache --no-compile-schemas \
+install --prefix=/usr --root=$pkgdir --optimize=1
+}

Deleted: meld.install
===
--- meld.install2014-09-28 20:24:31 UTC (rev 223672)
+++ meld.install2014-09-28 20:25:06 UTC (rev 223673)
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  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 223672, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2014-09-28 20:25:06 UTC (rev 223673)
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  update-mime-database usr/share/mime  /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}


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

2014-09-24 Thread Jan Steffens
Date: Thursday, September 25, 2014 @ 00:41:47
  Author: heftig
Revision: 222984

archrelease: copy trunk to extra-any

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

--+
 PKGBUILD |   70 -
 meld.install |   28 +++---
 2 files changed, 49 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-09-24 22:41:21 UTC (rev 222983)
+++ PKGBUILD2014-09-24 22:41:47 UTC (rev 222984)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Gaetan Bisson bis...@archlinux.org
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=meld
-pkgver=3.11.3
-pkgrel=1
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=(GPL)
-arch=(any)
-makedepends=(intltool itstool)
-install=meld.install
-depends=(python2-gobject gtksourceview3 hicolor-icon-theme desktop-file-utils
- gsettings-desktop-schemas)
-optdepends=('python2-dbus: open a new tab in an already running instance')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
-sha1sums=('c5ad856bbbd554394c25781ecc25c32e6a51d075')
-
-# Meld does not support Python 3. The build succeeds, but
-# the main executable checks the version and errors out.
-
-build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $pkgname-$pkgver
-  # using --skip-build breaks install
-  python2 setup.py --no-update-icon-cache --no-compile-schemas \
-install --prefix=/usr --root=$pkgdir --optimize=1
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 222983, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-09-24 22:41:47 UTC (rev 222984)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Gaetan Bisson bis...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=meld
+pkgver=3.11.4
+pkgrel=1
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject gtksourceview3 hicolor-icon-theme desktop-file-utils
+ gsettings-desktop-schemas)
+optdepends=('python2-dbus: open a new tab in an already running instance')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
+sha1sums=('18ebc2256f84f7083f3135f9422d23a52e336c55')
+
+# Meld does not support Python 3. The build succeeds, but
+# the main executable checks the version and errors out.
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  # using --skip-build breaks install
+  python2 setup.py --no-update-icon-cache --no-compile-schemas \
+install --prefix=/usr --root=$pkgdir --optimize=1
+}

Deleted: meld.install
===
--- meld.install2014-09-24 22:41:21 UTC (rev 222983)
+++ meld.install2014-09-24 22:41:47 UTC (rev 222984)
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  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 222983, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2014-09-24 22:41:47 UTC (rev 222984)
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  update-mime-database usr/share/mime  /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}



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

2014-08-23 Thread Jan Steffens
Date: Saturday, August 23, 2014 @ 11:26:30
  Author: heftig
Revision: 220585

archrelease: copy trunk to extra-any

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

--+
 PKGBUILD |   70 -
 meld.install |   28 +++---
 2 files changed, 49 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2014-08-23 09:26:25 UTC (rev 220584)
+++ PKGBUILD2014-08-23 09:26:30 UTC (rev 220585)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Gaetan Bisson bis...@archlinux.org
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=meld
-pkgver=3.11.2
-pkgrel=3
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=(GPL)
-arch=(any)
-makedepends=(intltool itstool)
-install=meld.install
-depends=(python2-gobject gtksourceview3 hicolor-icon-theme desktop-file-utils
- gsettings-desktop-schemas)
-optdepends=('python2-dbus: open a new tab in an already running instance')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
-sha1sums=('9d2dfe0579241ff8f4e9681945fb9cd229947edc')
-
-# Meld does not support Python 3. The build succeeds, but
-# the main executable checks the version and errors out.
-
-build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $pkgname-$pkgver
-  # using --skip-build breaks install
-  python2 setup.py --no-update-icon-cache --no-compile-schemas \
-install --prefix=/usr --root=$pkgdir --optimize=1
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 220584, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-08-23 09:26:30 UTC (rev 220585)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Gaetan Bisson bis...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=meld
+pkgver=3.11.3
+pkgrel=1
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject gtksourceview3 hicolor-icon-theme desktop-file-utils
+ gsettings-desktop-schemas)
+optdepends=('python2-dbus: open a new tab in an already running instance')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
+sha1sums=('c5ad856bbbd554394c25781ecc25c32e6a51d075')
+
+# Meld does not support Python 3. The build succeeds, but
+# the main executable checks the version and errors out.
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  # using --skip-build breaks install
+  python2 setup.py --no-update-icon-cache --no-compile-schemas \
+install --prefix=/usr --root=$pkgdir --optimize=1
+}

Deleted: meld.install
===
--- meld.install2014-08-23 09:26:25 UTC (rev 220584)
+++ meld.install2014-08-23 09:26:30 UTC (rev 220585)
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  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 220584, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2014-08-23 09:26:30 UTC (rev 220585)
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  update-mime-database usr/share/mime  /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}



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

2014-08-04 Thread Jan Steffens
Date: Monday, August 4, 2014 @ 21:14:29
  Author: heftig
Revision: 219292

archrelease: copy trunk to extra-any

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

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

Deleted: PKGBUILD
===
--- PKGBUILD2014-08-04 19:12:38 UTC (rev 219291)
+++ PKGBUILD2014-08-04 19:14:29 UTC (rev 219292)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
-# Contributor: Gaetan Bisson bis...@archlinux.org
-# Contributor: Daniel J Griffiths ghost1...@archlinux.us
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-
-pkgname=meld
-pkgver=3.11.2
-pkgrel=2
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=(GPL)
-arch=(any)
-makedepends=(intltool itstool)
-install=meld.install
-depends=(python2-gobject gtksourceview3 hicolor-icon-theme desktop-file-utils)
-optdepends=('python2-dbus: open a new tab in an already running instance')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
-sha1sums=('9d2dfe0579241ff8f4e9681945fb9cd229947edc')
-
-# Meld does not support Python 3. The build succeeds, but
-# the main executable checks the version and errors out.
-
-build() {
-  cd $pkgname-$pkgver
-  python2 setup.py build
-}
-
-package() {
-  cd $pkgname-$pkgver
-  # using --skip-build breaks install
-  python2 setup.py --no-update-icon-cache --no-compile-schemas \
-install --prefix=/usr --root=$pkgdir --optimize=1
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 219291, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2014-08-04 19:14:29 UTC (rev 219292)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
+# Contributor: Gaetan Bisson bis...@archlinux.org
+# Contributor: Daniel J Griffiths ghost1...@archlinux.us
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+
+pkgname=meld
+pkgver=3.11.2
+pkgrel=3
+pkgdesc='Visual diff and merge tool'
+url='http://meldmerge.org/'
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject gtksourceview3 hicolor-icon-theme desktop-file-utils
+ gsettings-desktop-schemas)
+optdepends=('python2-dbus: open a new tab in an already running instance')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz;)
+sha1sums=('9d2dfe0579241ff8f4e9681945fb9cd229947edc')
+
+# Meld does not support Python 3. The build succeeds, but
+# the main executable checks the version and errors out.
+
+build() {
+  cd $pkgname-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $pkgname-$pkgver
+  # using --skip-build breaks install
+  python2 setup.py --no-update-icon-cache --no-compile-schemas \
+install --prefix=/usr --root=$pkgdir --optimize=1
+}

Deleted: meld.install
===
--- meld.install2014-08-04 19:12:38 UTC (rev 219291)
+++ meld.install2014-08-04 19:14:29 UTC (rev 219292)
@@ -1,14 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  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 219291, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2014-08-04 19:14:29 UTC (rev 219292)
@@ -0,0 +1,14 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  update-mime-database usr/share/mime  /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}



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

2013-07-27 Thread Gaetan Bisson
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
===
--- PKGBUILD2013-07-28 02:54:08 UTC (rev 191617)
+++ PKGBUILD2013-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)
+++ PKGBUILD2013-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.install2013-07-28 02:54:08 UTC (rev 191617)
+++ meld.install2013-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.install2013-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
+}



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

2013-06-03 Thread 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
===
--- PKGBUILD2013-06-04 04:32:39 UTC (rev 187112)
+++ PKGBUILD2013-06-04 04:33:17 UTC (rev 187113)
@@ -1,35 +0,0 @@
-# $Id$
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Maintainer: Daniel J Griffiths ghost1...@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)
+++ PKGBUILD2013-06-04 04:33:17 UTC (rev 187113)
@@ -0,0 +1,36 @@
+# $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
+}

Deleted: meld.install
===
--- meld.install2013-06-04 04:32:39 UTC (rev 187112)
+++ meld.install2013-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.install2013-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
+}



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

2013-04-15 Thread Jan Steffens
Date: Tuesday, April 16, 2013 @ 00:21:07
  Author: heftig
Revision: 182885

archrelease: copy trunk to extra-any

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

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

Deleted: PKGBUILD
===
--- PKGBUILD2013-04-15 22:20:20 UTC (rev 182884)
+++ PKGBUILD2013-04-15 22:21:07 UTC (rev 182885)
@@ -1,35 +0,0 @@
-# $Id$
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
-
-pkgname=meld
-pkgver=1.7.1
-pkgrel=2
-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=('c5dc21d32405a520cc7969f4de9e2ea356cb0e950fc5a20a9053230313ff3a40')
-
-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 182884, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2013-04-15 22:21:07 UTC (rev 182885)
@@ -0,0 +1,35 @@
+# $Id$
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Maintainer: Daniel J Griffiths ghost1...@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
+}

Deleted: meld.install
===
--- meld.install2013-04-15 22:20:20 UTC (rev 182884)
+++ meld.install2013-04-15 22:21:07 UTC (rev 182885)
@@ -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 182884, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2013-04-15 22:21:07 UTC (rev 182885)
@@ -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
+}



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

2013-04-13 Thread Eric Bélanger
Date: Sunday, April 14, 2013 @ 06:37:34
  Author: eric
Revision: 182746

archrelease: copy trunk to extra-any

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

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

Deleted: PKGBUILD
===
--- PKGBUILD2013-04-14 04:37:15 UTC (rev 182745)
+++ PKGBUILD2013-04-14 04:37:34 UTC (rev 182746)
@@ -1,30 +0,0 @@
-# $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
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 182745, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2013-04-14 04:37:34 UTC (rev 182746)
@@ -0,0 +1,35 @@
+# $Id$
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=meld
+pkgver=1.7.1
+pkgrel=2
+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=('c5dc21d32405a520cc7969f4de9e2ea356cb0e950fc5a20a9053230313ff3a40')
+
+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.install2013-04-14 04:37:15 UTC (rev 182745)
+++ meld.install2013-04-14 04:37:34 UTC (rev 182746)
@@ -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 182745, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2013-04-14 04:37:34 UTC (rev 182746)
@@ -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
+}



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

2013-03-11 Thread 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
===
--- PKGBUILD2013-03-11 23:34:32 UTC (rev 179919)
+++ PKGBUILD2013-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)
+++ PKGBUILD2013-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.install2013-03-11 23:34:32 UTC (rev 179919)
+++ meld.install2013-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.install2013-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
+}



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

2013-03-08 Thread Eric Bélanger
Date: Friday, March 8, 2013 @ 22:02:53
  Author: eric
Revision: 179624

archrelease: copy trunk to extra-any

Added:
  meld/repos/extra-any/PKGBUILD
(from rev 179623, meld/trunk/PKGBUILD)
  meld/repos/extra-any/meld.install
(from rev 179623, 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
===
--- PKGBUILD2013-03-08 21:02:35 UTC (rev 179623)
+++ PKGBUILD2013-03-08 21:02:53 UTC (rev 179624)
@@ -1,29 +0,0 @@
-# $Id$
-# Contributor: Douglas Soares de Andrade doug...@archlinux.org
-# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
-
-pkgname=meld
-pkgver=1.6.1
-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=('de9c4d526c7489b6e6c5772b709aea4b77e1b3d1b6cd1701fc1c17ea81733a03')
-
-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 179623, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2013-03-08 21:02:53 UTC (rev 179624)
@@ -0,0 +1,29 @@
+# $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
+}

Deleted: meld.install
===
--- meld.install2013-03-08 21:02:35 UTC (rev 179623)
+++ meld.install2013-03-08 21:02:53 UTC (rev 179624)
@@ -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 179623, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2013-03-08 21:02:53 UTC (rev 179624)
@@ -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
+}



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

2012-10-21 Thread Ionut Biru
Date: Sunday, October 21, 2012 @ 09:41:21
  Author: ibiru
Revision: 169456

archrelease: copy trunk to extra-any

Added:
  meld/repos/extra-any/PKGBUILD
(from rev 169455, meld/trunk/PKGBUILD)
  meld/repos/extra-any/meld.install
(from rev 169455, 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
===
--- PKGBUILD2012-10-21 13:40:39 UTC (rev 169455)
+++ PKGBUILD2012-10-21 13:41:21 UTC (rev 169456)
@@ -1,29 +0,0 @@
-# $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
-}

Copied: meld/repos/extra-any/PKGBUILD (from rev 169455, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-10-21 13:41:21 UTC (rev 169456)
@@ -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.1
+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=('de9c4d526c7489b6e6c5772b709aea4b77e1b3d1b6cd1701fc1c17ea81733a03')
+
+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.install2012-10-21 13:40:39 UTC (rev 169455)
+++ meld.install2012-10-21 13:41:21 UTC (rev 169456)
@@ -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 169455, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2012-10-21 13:41:21 UTC (rev 169456)
@@ -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
+}



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

2012-04-28 Thread Ionut Biru
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
===
--- PKGBUILD2012-04-28 12:36:41 UTC (rev 157446)
+++ PKGBUILD2012-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)
+++ PKGBUILD2012-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.install2012-04-28 12:36:41 UTC (rev 157446)
+++ meld.install2012-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.install2012-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
+}



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

2012-04-05 Thread Ionut Biru
Date: Thursday, April 5, 2012 @ 07:08:01
  Author: ibiru
Revision: 155713

archrelease: copy trunk to extra-any

Added:
  meld/repos/extra-any/PKGBUILD
(from rev 155712, meld/trunk/PKGBUILD)
  meld/repos/extra-any/meld.install
(from rev 155712, 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
===
--- PKGBUILD2012-04-05 10:56:27 UTC (rev 155712)
+++ PKGBUILD2012-04-05 11:08:01 UTC (rev 155713)
@@ -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.3
-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}/1.5/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('a27890202584920db941f78c64ba79662b3cdcf5f90c0d2f140a4b52858229b9')
-
-build() {
-cd ${srcdir}/${pkgname}-${pkgver}
-make PYTHON=python2 prefix=/usr
-}
-
-package() {
-cd ${srcdir}/${pkgname}-${pkgver}
-make PYTHON=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 155712, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-04-05 11:08:01 UTC (rev 155713)
@@ -0,0 +1,29 @@
+# $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
+}

Deleted: meld.install
===
--- meld.install2012-04-05 10:56:27 UTC (rev 155712)
+++ meld.install2012-04-05 11:08:01 UTC (rev 155713)
@@ -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 155712, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2012-04-05 11:08:01 UTC (rev 155713)
@@ -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
+}



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

2012-01-27 Thread Ionut Biru
Date: Friday, January 27, 2012 @ 06:14:44
  Author: ibiru
Revision: 147718

archrelease: copy trunk to extra-any

Added:
  meld/repos/extra-any/PKGBUILD
(from rev 147717, meld/trunk/PKGBUILD)
  meld/repos/extra-any/meld.install
(from rev 147717, 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
===
--- PKGBUILD2012-01-27 11:12:04 UTC (rev 147717)
+++ PKGBUILD2012-01-27 11:14:44 UTC (rev 147718)
@@ -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.2
-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}/1.5/${pkgname}-${pkgver}.tar.xz;)
-sha256sums=('bddd8322437fc4d5cf0d17e6f7e85ee273d86275a209640813d0e2451d9e2b17')
-
-build() {
-cd ${srcdir}/${pkgname}-${pkgver}
-make PYTHON=python2 prefix=/usr
-}
-
-package() {
-cd ${srcdir}/${pkgname}-${pkgver}
-make PYTHON=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 147717, meld/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2012-01-27 11:14:44 UTC (rev 147718)
@@ -0,0 +1,29 @@
+# $Id$
+# Contributor: Douglas Soares de Andrade doug...@archlinux.org
+# Maintainer: Daniel J Griffiths ghost1...@archlinux.us
+
+pkgname=meld
+pkgver=1.5.3
+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}/1.5/${pkgname}-${pkgver}.tar.xz;)
+sha256sums=('a27890202584920db941f78c64ba79662b3cdcf5f90c0d2f140a4b52858229b9')
+
+build() {
+cd ${srcdir}/${pkgname}-${pkgver}
+make PYTHON=python2 prefix=/usr
+}
+
+package() {
+cd ${srcdir}/${pkgname}-${pkgver}
+make PYTHON=python2 prefix=/usr DESTDIR=${pkgdir} install
+sed -i -e 's#env python#env python2#' ${pkgdir}/usr/bin/meld
+}

Deleted: meld.install
===
--- meld.install2012-01-27 11:12:04 UTC (rev 147717)
+++ meld.install2012-01-27 11:14:44 UTC (rev 147718)
@@ -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 147717, 
meld/trunk/meld.install)
===
--- meld.install(rev 0)
+++ meld.install2012-01-27 11:14:44 UTC (rev 147718)
@@ -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
+}