[arch-commits] Commit in meld/repos (3 files)

[Jan de Groot]

    Date: Sunday, July 20, 2008 @ 12:28:23
  Author: jgc
Revision: 5741

Merged revisions 4049-5740 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/meld/trunk

........
  r5612 | jgc | 2008-07-18 23:23:56 +0000 (Fri, 18 Jul 2008) | 2 lines
  
  upgpkg: meld 1.2-2
      Remove need for desktop-file-utils - no mimetype in desktop file
........

Modified:
  meld/repos/extra-i686/	(properties)
  meld/repos/extra-i686/PKGBUILD
Deleted:
  meld/repos/extra-i686/meld.install

--------------+
 PKGBUILD     |   11 +++++------
 meld.install |   15 ---------------
 2 files changed, 5 insertions(+), 21 deletions(-)


Property changes on: meld/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /meld/trunk:1-4048
   + /meld/trunk:1-5740

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-07-20 16:13:54 UTC (rev 5740)
+++ extra-i686/PKGBUILD	2008-07-20 16:28:23 UTC (rev 5741)
@@ -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' 'intltool')
-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-i686/meld.install
===================================================================
--- extra-i686/meld.install	2008-07-20 16:13:54 UTC (rev 5740)
+++ extra-i686/meld.install	2008-07-20 16:28:23 UTC (rev 5741)
@@ -1,15 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*