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

[Eric Belanger]

    Date: Wednesday, June 25, 2008 @ 17:41:40
  Author: eric
Revision: 3585

fixing svn conflict

Modified:
  basket/repos/extra-i686/PKGBUILD
  basket/repos/extra-x86_64/	(properties)
  basket/repos/extra-x86_64/PKGBUILD

-----------------------+
 extra-i686/PKGBUILD   |    3 ++-
 extra-x86_64/PKGBUILD |    9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-25 21:38:44 UTC (rev 3584)
+++ extra-i686/PKGBUILD	2008-06-25 21:41:40 UTC (rev 3585)
@@ -9,8 +9,9 @@
 arch=(i686 x86_64)
 url="http://basket.kde.org/"
 depends=('kdelibs' 'gpgme')
-license="GPL"
+license=('GPL')
 source=(http://basket.kde.org/downloads/$pkgname-$pkgver.tar.gz)
+md5sums=('38ba3faa2620d04e42d9239d6764cb15')
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/opt/kde


Property changes on: basket/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /basket/trunk:1
   + /basket/trunk:1-3584

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-06-25 21:38:44 UTC (rev 3584)
+++ extra-x86_64/PKGBUILD	2008-06-25 21:41:40 UTC (rev 3585)
@@ -3,15 +3,15 @@
 # Contributor: lucke <lucke at o2 dot pl>
 
 pkgname=basket
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.3
+pkgrel=1
 pkgdesc="All-purpose notes taker for KDE."
 arch=(i686 x86_64)
 url="http://basket.kde.org/"
 depends=('kdelibs' 'gpgme')
-makedepends=('kdepim')
-license=(GPL)
+license=('GPL')
 source=(http://basket.kde.org/downloads/$pkgname-$pkgver.tar.gz)
+md5sums=('38ba3faa2620d04e42d9239d6764cb15')
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/opt/kde
@@ -19,4 +19,3 @@
   make DESTDIR=$startdir/pkg install
 }
 
-md5sums=('d71c62a56de9cc32ba2633e63e99071f')