[arch-commits] Commit in meld/trunk (PKGBUILD PKGBUILD-3.11 install meld.install)

[Jan Steffens]

    Date: Saturday, July 12, 2014 @ 19:52:44
  Author: heftig
Revision: 216840

3.11.2

Added:
  meld/trunk/meld.install
    (from rev 216839, meld/trunk/install)
Modified:
  meld/trunk/PKGBUILD
Deleted:
  meld/trunk/PKGBUILD-3.11
  meld/trunk/install

---------------+
 PKGBUILD      |   42 ++++++++++++++++++------------------------
 PKGBUILD-3.11 |   33 ---------------------------------
 install       |   13 -------------
 meld.install  |   14 ++++++++++++++
 4 files changed, 32 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-12 17:35:09 UTC (rev 216839)
+++ PKGBUILD	2014-07-12 17:52:44 UTC (rev 216840)
@@ -1,38 +1,32 @@
 # $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=meld
-pkgver=1.8.5
+pkgver=3.11.2
 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=('a1f01bc68820c7e35c374dfb1923ed20ac28e603')
+license=(GPL)
+arch=(any)
+makedepends=(intltool itstool)
+install=meld.install
+depends=(python2-gobject gtk3 hicolor-icon-theme desktop-file-utils)
+optdepends=('gtksourceview3: syntax highlighting'
+            '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')
 
-install=install
-options=('!emptydirs')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed -i 's/env python/env python2/' bin/meld
-}
-
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PYTHON=/usr/bin/python2 prefix=/usr
+  cd $pkgname-$pkgver
+  python2 setup.py build
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install \
-		update_desktop_database= update_mime_database=
+  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: PKGBUILD-3.11
===================================================================
--- PKGBUILD-3.11	2014-07-12 17:35:09 UTC (rev 216839)
+++ PKGBUILD-3.11	2014-07-12 17:52:44 UTC (rev 216840)
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 204566 2014-01-22 23:15:09Z heftig $
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
-
-pkgname=meld
-pkgver=3.11.1
-pkgrel=1
-pkgdesc='Visual diff and merge tool'
-url='http://meldmerge.org/'
-license=('GPL')
-arch=('any')
-makedepends=('intltool' 'itstool')
-depends=('python2-gobject' 'gtk3' 'hicolor-icon-theme' 'desktop-file-utils')
-optdepends=('gtksourceview3: syntax highlighting'
-            '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=('d7a641bcb67dbae5087708bfe256a8385f015e13')
-
-# Don't forget to add the glib-compile-schemas call to install when using this PKGBUILD
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	python2 setup.py build
-}
-
-package() {
-	cd "${srcdir}/${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: install
===================================================================
--- install	2014-07-12 17:35:09 UTC (rev 216839)
+++ install	2014-07-12 17:52:44 UTC (rev 216840)
@@ -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/trunk/meld.install (from rev 216839, meld/trunk/install)
===================================================================
--- meld.install	                        (rev 0)
+++ meld.install	2014-07-12 17:52:44 UTC (rev 216840)
@@ -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
+}