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

[Eric Bélanger]

    Date: Wednesday, January 21, 2009 @ 17:41:35
  Author: eric
Revision: 24854

Merged revisions 23416,24853 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/kdiff3/trunk

........
  r23416 | eric | 2009-01-09 23:19:11 -0500 (Fri, 09 Jan 2009) | 1 line
  
  upgpkg: kdiff3 0.9.93-1
........
  r24853 | eric | 2009-01-21 17:41:12 -0500 (Wed, 21 Jan 2009) | 2 lines
  
  upgpkg: kdiff3 0.9.94-1
      Upstream update
........

Modified:
  kdiff3/repos/extra-x86_64/	(properties)
  kdiff3/repos/extra-x86_64/ChangeLog
  kdiff3/repos/extra-x86_64/PKGBUILD	(contents, properties)

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |    8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)


Property changes on: kdiff3/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdiff3/trunk:1-23413
   + /kdiff3/trunk:1-24853

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-01-21 22:41:12 UTC (rev 24853)
+++ extra-x86_64/ChangeLog	2009-01-21 22:41:35 UTC (rev 24854)
@@ -1,3 +1,8 @@
+2009-01-21  Eric Belanger  <eric at archlinux.org>
+
+	* kdiff3 0.9.94-1
+	* Upstream update
+
 2009-01-08  Eric Belanger  <eric at archlinux.org>
 
 	* kdiff3 0.9.93-1

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-01-21 22:41:12 UTC (rev 24853)
+++ extra-x86_64/PKGBUILD	2009-01-21 22:41:35 UTC (rev 24854)
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.8 2008/07/28 03:43:36 Snowman Exp $
+# $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Eric Belanger <eric at archlinux.org>
 
 pkgname=kdiff3
-pkgver=0.9.93
+pkgver=0.9.94
 pkgrel=1
 pkgdesc="A KDE file comparator/merge tool"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3f225daebc7f94e237d66edabf2e39ab')
-sha1sums=('b0bdfa4c91cfcc97dbea6f462d22f970cd711373')
+md5sums=('8bf580e53a420b1aa1eca3ea502bbe8b')
+sha1sums=('6c59764ea48e19adcf42f0121e1e3aac80777815')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}


Property changes on: kdiff3/repos/extra-x86_64/PKGBUILD
___________________________________________________________________
Added: svn:keywords
   + Id