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
===================================================================
--- PKGBUILD 2014-09-28 20:24:31 UTC (rev 223672)
+++ PKGBUILD 2014-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)
+++ PKGBUILD 2014-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.install 2014-09-28 20:24:31 UTC (rev 223672)
+++ meld.install 2014-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.install 2014-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
+}
