[arch-commits] Commit in meld/repos/extra-any (4 files)
Eric Bélanger
eric at nymeria.archlinux.org
Sun Apr 14 04:37:34 UTC 2013
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
===================================================================
--- PKGBUILD 2013-04-14 04:37:15 UTC (rev 182745)
+++ PKGBUILD 2013-04-14 04:37:34 UTC (rev 182746)
@@ -1,30 +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.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)
+++ PKGBUILD 2013-04-14 04:37:34 UTC (rev 182746)
@@ -0,0 +1,35 @@
+# $Id$
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+# Maintainer: Daniel J Griffiths <ghost1227 at 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.install 2013-04-14 04:37:15 UTC (rev 182745)
+++ meld.install 2013-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.install 2013-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
+}
More information about the arch-commits
mailing list