[arch-commits] Commit in meld/repos (3 files)
Jan de Groot
jgc at archlinux.org
Fri Jul 18 23:25:41 UTC 2008
Date: Friday, July 18, 2008 @ 19:25:41
Author: jgc
Revision: 5616
Fix conflict
Modified:
meld/repos/extra-x86_64/ (properties)
meld/repos/extra-x86_64/PKGBUILD
Deleted:
meld/repos/extra-x86_64/meld.install
--------------+
PKGBUILD | 11 +++++------
meld.install | 15 ---------------
2 files changed, 5 insertions(+), 21 deletions(-)
Property changes on: meld/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /meld/trunk:1-4041
+ /meld/trunk:1-5612
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-07-18 23:24:20 UTC (rev 5615)
+++ extra-x86_64/PKGBUILD 2008-07-18 23:25:41 UTC (rev 5616)
@@ -2,23 +2,22 @@
# Maintainer:
pkgname=meld
pkgver=1.2
-pkgrel=1
+pkgrel=2
pkgdesc="Visual diff and merge tool for GNOME"
arch=(i686 x86_64)
license=('GPL')
url="http://meld.sourceforge.net/"
-depends=('gnome-python-desktop>=2.20.0-3 gtksourceview')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.11.2')
-install=meld.install
+depends=('gnome-python-desktop>=2.22.0' 'gtksourceview')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'intltool')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.2/${pkgname}-${pkgver}.tar.gz
meld_buildfix.diff)
md5sums=('50ea5a7cdf2451448a78e53b172d7f6f'
'074042dcafc9869a4dad69e0d1d92b0e')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i ../meld_buildfix.diff || return 1
make prefix=/usr || return 1
make prefix=/usr DESTDIR=${pkgdir} install || return 1
- rm -rf ${startdir}/pkg/usr/gnome/share/doc
+ rm -rf ${pkgdir}/usr/gnome/share/doc
}
Deleted: extra-x86_64/meld.install
===================================================================
--- extra-x86_64/meld.install 2008-07-18 23:24:20 UTC (rev 5615)
+++ extra-x86_64/meld.install 2008-07-18 23:25:41 UTC (rev 5616)
@@ -1,15 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
-
-op=$1
-shift
-$op $*
More information about the arch-commits
mailing list