[arch-commits] Commit in conky (3 files)

[Giovanni Scafora]

    Date: Sunday, September 7, 2008 @ 07:15:28
  Author: giovanni
Revision: 11991

Merged revisions 932-11990 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/conky/trunk

........
  r976 | eric | 2008-04-26 03:08:19 +0200 (sab, 26 apr 2008) | 2 lines
  
  upgpkg: conky 1.5.1-1
      removing empty /usr/etc directory
........

Modified:
  conky/repos/extra-i686/	(properties)
  conky/repos/extra-i686/PKGBUILD
  conky/trunk/PKGBUILD

---------------------------+
 repos/extra-i686/PKGBUILD |    3 ++-
 trunk/PKGBUILD            |   11 ++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)


Property changes on: conky/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /conky/trunk:1-931
   + /conky/trunk:1-11990

Modified: repos/extra-i686/PKGBUILD
===================================================================
--- repos/extra-i686/PKGBUILD	2008-09-07 00:35:22 UTC (rev 11990)
+++ repos/extra-i686/PKGBUILD	2008-09-07 11:15:28 UTC (rev 11991)
@@ -12,6 +12,7 @@
 replaces=('torsmo')
 depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage')
 source=(http://optusnet.dl.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2)
+md5sums=('afc121a67e4405cb44b7738be79946ac')
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/usr --enable-xft --enable-mpd --enable-double-buffer \
@@ -20,7 +21,7 @@
   make DESTDIR=$startdir/pkg install
   mkdir -p $startdir/pkg/etc/xdg/
   mv $startdir/pkg/usr/etc/conky/ $startdir/pkg/etc/xdg/
+  rmdir $startdir/pkg/usr/etc
   install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums=('afc121a67e4405cb44b7738be79946ac')

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2008-09-07 00:35:22 UTC (rev 11990)
+++ trunk/PKGBUILD	2008-09-07 11:15:28 UTC (rev 11991)
@@ -3,16 +3,17 @@
 # Contributor: MrGreen <mrgreen.linuxuser at gmail.com>
 
 pkgname=conky
-pkgver=1.5.1
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="Conky is an advanced, highly configurable system monitor for X based on torsmo"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://conky.sourceforge.net/"
 license=('custom')
 replaces=('torsmo')
 depends=('libxext' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage')
-source=(http://optusnet.dl.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2)
-md5sums=('afc121a67e4405cb44b7738be79946ac')
+makedepends=('pkgconfig')
+source=(http://downloads.sourceforge.net/sourceforge/conky/$pkgname-$pkgver.tar.bz2)
+
 build() {
   cd $startdir/src/$pkgname-$pkgver
   ./configure --prefix=/usr --enable-xft --enable-mpd --enable-double-buffer \
@@ -21,7 +22,7 @@
   make DESTDIR=$startdir/pkg install
   mkdir -p $startdir/pkg/etc/xdg/
   mv $startdir/pkg/usr/etc/conky/ $startdir/pkg/etc/xdg/
-  rmdir $startdir/pkg/usr/etc
   install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
 }
 
+md5sums=('b2839f21cec18e5eaa338c7440a1ba28')