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

[Eric Bélanger]

    Date: Tuesday, February 24, 2009 @ 19:15:30
  Author: eric
Revision: 27720

fixed svn conflict

Added:
  gdeskcal/repos/extra-i686/gdeskcal-utf8.diff
    (from rev 27717, gdeskcal/trunk/gdeskcal-utf8.diff)
Modified:
  gdeskcal/repos/extra-i686/	(properties)
  gdeskcal/repos/extra-i686/PKGBUILD

--------------------+
 PKGBUILD           |   18 ++++++++++--------
 gdeskcal-utf8.diff |    8 ++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)


Property changes on: gdeskcal/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /gdeskcal/trunk:1
   + /gdeskcal/trunk:1-27719

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-02-25 00:04:37 UTC (rev 27719)
+++ extra-i686/PKGBUILD	2009-02-25 00:15:30 UTC (rev 27720)
@@ -1,21 +1,23 @@
 # $Id$
-# Mantainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gdeskcal
 pkgver=1.01
-pkgrel=1
+pkgrel=2
 pkgdesc="gDeskCal is a cute little eye-candy calendar for your desktop."
 arch=(i686 x86_64)
 license=('GPL')
-url="http://www.pycage.de/#gdeskcal"
+url="http://customize.org/gDeskCal"
 depends=('pygtk')
-source=(http://www.pycage.de/download/gDeskCal-${pkgver}.tar.gz)
-md5sums=('6198d3fb3b28eec6ec430564defda781')
+makedepends=('perlxml')
+source=(ftp://ftp.archlinux.org/other/gdeskcal/gDeskCal-${pkgver}.tar.gz gdeskcal-utf8.diff)
+md5sums=('6198d3fb3b28eec6ec430564defda781' '9a023efe0efbe3a2f3877da555e6986b')
 
 build() {
-  cd $startdir/src/gDeskCal-${pkgver}
+  cd ${srcdir}/gDeskCal-${pkgver}
+  patch -p1 < ../gdeskcal-utf8.diff || return 1 
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var
+              --localstatedir=/var || return 1 
   make || return 1 
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${pkgdir} install || return 1 
 }

Copied: gdeskcal/repos/extra-i686/gdeskcal-utf8.diff (from rev 27717, gdeskcal/trunk/gdeskcal-utf8.diff)
===================================================================
--- extra-i686/gdeskcal-utf8.diff	                        (rev 0)
+++ extra-i686/gdeskcal-utf8.diff	2009-02-25 00:15:30 UTC (rev 27720)
@@ -0,0 +1,8 @@
+diff -Naur gDeskCal-1.01-old/code/values.py gDeskCal-1.01/code/values.py
+--- gDeskCal-1.01-old/code/values.py	2009-02-24 17:44:31.000000000 -0500
++++ gDeskCal-1.01/code/values.py	2009-02-24 17:45:03.000000000 -0500
+@@ -1,3 +1,4 @@
++# coding=UTF-8
+ NAME = "gDeskCal"
+ VERSION = "1.01"
+ AUTHOR = "Martin Grimme  <martin.grimme at lintegra.de>"