[arch-commits] Commit in xfprint/repos (extra-i686 extra-i686/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Tuesday, April 21, 2009 @ 00:29:55
  Author: andyrtr
Revision: 36341

solve svn conflict

Modified:
  xfprint/repos/extra-i686/	(properties)
  xfprint/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


Property changes on: xfprint/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xfprint/trunk:1-28213
   + /xfprint/trunk:1-36340

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-21 02:20:23 UTC (rev 36340)
+++ extra-i686/PKGBUILD	2009-04-21 04:29:55 UTC (rev 36341)
@@ -2,20 +2,20 @@
 # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfprint
-pkgver=4.6.0
+pkgver=4.6.1
 pkgrel=1
 pkgdesc="A print dialog and a printer manager for Xfce"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
-depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.9-3' 'a2ps' 'heimdal>=1.2.1-3'
-         'gnutls>=2.6.3' 'hicolor-icon-theme')
+depends=("libxfcegui4>=$pkgver" "xfconf>=$pkgver" 'libcups>=1.3.10' 'a2ps' 'heimdal>=1.2.1-3'
+         'gnutls>=2.6.5' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('cf2e0de43367da6a0ef7eeef04876281')
+md5sums=('d92fca97a42816085080baf07a99a62e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}