Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=e9baf82c4da23dfa65606553b80f6eadda65cea2
commit e9baf82c4da23dfa65606553b80f6eadda65cea2 Merge: 0e7831f 95adb94 Author: Devil505 <devil505li...@gmail.com> Date: Sun Jan 2 08:48:56 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/xfce4-extra/tumbler/FrugalBuild source/xfce4-extra/xfce4-notifyd/FrugalBuild source/xfce4/ristretto/FrugalBuild source/xfce4/xfce4-cpugraph-plugin/FrugalBuild source/xfce4/xfce4-dict/FrugalBuild source/xfce4/xfce4-fsguard-plugin/FrugalBuild source/xfce4/xfce4-netload-plugin/FrugalBuild source/xfce4/xfce4-notes-plugin/FrugalBuild source/xfce4/xfce4-screenshooter/FrugalBuild source/xfce4/xfce4-systemload-plugin/FrugalBuild source/xfce4/xfce4-taskmanager/FrugalBuild source/xfce4/xfce4-wavelan-plugin/FrugalBuild diff --cc source/xfce4-extra/xfce4-notifyd/FrugalBuild index 7191127,503c1d7..f7afd99 --- a/source/xfce4-extra/xfce4-notifyd/FrugalBuild +++ b/source/xfce4-extra/xfce4-notifyd/FrugalBuild @@@ -2,11 -2,11 +2,11 @@@ # Maintainer: Devil505 <devil505li...@gmail.com> pkgname=xfce4-notifyd -pkgver=0.1.0 -pkgrel=4 +pkgver=0.2.0 - pkgrel=1 ++pkgrel=2 pkgdesc="notification daemon for the xfce desktop" -url="http://spuriousinterrupt.org/projects/xfce4-notify-daemon/"; -depends=('dbus-glib' 'gtk+2-libs' 'cairo' 'zlib' 'libxfcegui4' 'libxext' 'libxfixes' 'libsm' 'libuuid' 'libgcc' 'libsexy') +url="http://spuriousinterrupt.org/projects/xfce4-notifyd"; +depends=('libxfce4ui' 'libuuid') makedepends=('pkgconfig' 'intltool') options=('scriptlet') groups=('xfce4-extra') diff --cc source/xfce4/ristretto/FrugalBuild index 6bd15d5,84c64ba..972b277 --- a/source/xfce4/ristretto/FrugalBuild +++ b/source/xfce4/ristretto/FrugalBuild @@@ -2,18 -2,18 +2,17 @@@ # Maintainer: Priyank Gosalia <priyan...@gmail.com> pkgname=ristretto -pkgver=0.0.22 -pkgrel=4 +pkgver=0.0.91 - pkgrel=1 ++pkgrel=2 pkgdesc="A fast and lightweight picture viewer for Xfce." makedepends=('intltool') -depends=('libxfce4util>=4.6.1' 'thunar>=1.0.1-4') +depends=('libxfce4util>=4.7.3' 'thunar>=1.1.4' 'libxfcegui4>=4.7.0') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') _F_gnome_iconcache="y" --_F_xfce_goodies_ext=".tar.gz" Finclude xfce4 gnome-scriptlet url="http://goodies.xfce.org/projects/applications/ristretto"; -source="http://archive.xfce.org/src/apps/ristretto/0.0/$pkgname-$pkgver.tar.gz"; -sha1sums=('bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a') +sha1sums=('753723d0a2a844980cab0ba3d226ede6b2ceab91') +source=(http://archive.xfce.org/src/apps/ristretto/0.0/$pkgname-$pkgver.tar.bz2) # optimization OK diff --cc source/xfce4/xfce4-clipman-plugin/FrugalBuild index 9613041,e6e2468..6918f73 --- a/source/xfce4/xfce4-clipman-plugin/FrugalBuild +++ b/source/xfce4/xfce4-clipman-plugin/FrugalBuild @@@ -12,7 -12,7 +12,8 @@@ archs=('i686' 'x86_64' 'ppc' _F_gnome_iconcache=y _F_xfce_category="panel-plugins" Finclude xfce4 gnome-scriptlet - sha1sums=('b0ac9175f98b062995d8af7dbcdabcea41e48f6f') + source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.1/$pkgname-$pkgver.tar.bz2) + sha1sums=('261f82dcc8313cef9e7a52494e58741c2b2ada64') # optimization OK + diff --cc source/xfce4/xfce4-cpugraph-plugin/FrugalBuild index 00c7080,9f5b356..983ea95 --- a/source/xfce4/xfce4-cpugraph-plugin/FrugalBuild +++ b/source/xfce4/xfce4-cpugraph-plugin/FrugalBuild @@@ -3,15 -3,16 +3,17 @@@ pkgname=xfce4-cpugraph-plugin pkgver=1.0.1 --pkgrel=1 ++pkgrel=2 pkgdesc="CPU graph plugin for the Xfce panel" -depends=('libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4') +depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.6') makedepends=('intltool') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') _F_xfce_goodies_ext=".tar.bz2" - Finclude xfce4 + _F_xfce_category="panel-plugins" + _F_gnome_iconcache="y" + Finclude xfce4 gnome-scriptlet sha1sums=('666ed5f8ce379585622105390e7a58d1cb3cebc6') +source=(http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.0/$pkgname-$pkgver.tar.bz2) # optimization OK diff --cc source/xfce4/xfce4-dict/FrugalBuild index ee137c9,e3ed462..e073be1 --- a/source/xfce4/xfce4-dict/FrugalBuild +++ b/source/xfce4/xfce4-dict/FrugalBuild @@@ -3,20 -3,18 +3,31 @@@ pkgname=xfce4-dict pkgver=0.6.0 ++<<<<<<< HEAD +pkgrel=2 +pkgdesc="A dictionary application and panel plugin for XFCE" +makedepends=('intltool') +depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.4') ++======= + pkgrel=1 + pkgdesc="A dictionary application and panel plugin for XFCE" + makedepends=('intltool') + depends=('libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4') ++>>>>>>> 95adb94b9277a8911bde96682d703f2616478b23 groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') conflicts=('xfce4-dict-plugin') replaces=('xfce4-dict-plugin') +_F_xfce_category="apps" _F_gnome_iconcache="y" + _F_xfce_category="apps" _F_xfce_goodies_ext=".tar.bz2" Finclude xfce4 gnome-scriptlet sha1sums=('af004096d6bd935d69b7ef3a989470e89c7be99b') ++<<<<<<< HEAD +source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/$pkgname-$pkgver.tar.bz2) ++======= ++>>>>>>> 95adb94b9277a8911bde96682d703f2616478b23 # optimization OK + diff --cc source/xfce4/xfce4-fsguard-plugin/FrugalBuild index 37c4eed,869b16c..63c34b6 --- a/source/xfce4/xfce4-fsguard-plugin/FrugalBuild +++ b/source/xfce4/xfce4-fsguard-plugin/FrugalBuild @@@ -3,14 -3,14 +3,15 @@@ pkgname=xfce4-fsguard-plugin pkgver=1.0.0 --pkgrel=1 ++pkgrel=2 pkgdesc="A filesystem usage monitor plugin for the Xfce4 panel" makedepends=('intltool') - depends=('libxfcegui4>=4.6.1-3' 'xfce4-panel>=4.7.6' 'libxml2') -depends=('libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4' 'libxml2') ++depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.6' 'libxml2') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') +_F_xfce_category="panel-plugins" _F_gnome_iconcache=y + _F_xfce_category="panel-plugins" Finclude xfce4 gnome-scriptlet sha1sums=('0560c68733c17d1905e80f247e7453d713aace34') diff --cc source/xfce4/xfce4-netload-plugin/FrugalBuild index e318272,48c9e4d..47e4b3e --- a/source/xfce4/xfce4-netload-plugin/FrugalBuild +++ b/source/xfce4/xfce4-netload-plugin/FrugalBuild @@@ -3,10 -3,10 +3,10 @@@ pkgname=xfce4-netload-plugin pkgver=1.0.0 --pkgrel=1 ++pkgrel=2 pkgdesc="A netload plugin for the Xfce4 panel" makedepends=('intltool') - depends=('libxfcegui4>=4.6.1-3' 'xfce4-panel>=4.6.1-3' 'libxml2') -depends=('libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4' 'libxml2') ++depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.6' 'libxml2') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') _F_xfce_category="panel-plugins" diff --cc source/xfce4/xfce4-notes-plugin/FrugalBuild index 5acb265,2586614..4c0ad9b --- a/source/xfce4/xfce4-notes-plugin/FrugalBuild +++ b/source/xfce4/xfce4-notes-plugin/FrugalBuild @@@ -3,10 -3,10 +3,10 @@@ pkgname=xfce4-notes-plugin pkgver=1.7.7 --pkgrel=1 ++pkgrel=2 pkgdesc="A notes plugin for the Xfce4 panel." makedepends=('intltool') -depends=('libxfcegui4>=4.6.1-3' 'xfce4-panel>=4.6.1-2' 'thunar>=1.0.1-3' 'libxml2' 'unique') +depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.6' 'thunar>=1.1.5' 'libxml2' 'unique') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') _F_gnome_iconcache=y diff --cc source/xfce4/xfce4-screenshooter/FrugalBuild index 52ea934,2b52e07..ef3f5da --- a/source/xfce4/xfce4-screenshooter/FrugalBuild +++ b/source/xfce4/xfce4-screenshooter/FrugalBuild @@@ -3,11 -3,11 +3,11 @@@ pkgname=xfce4-screenshooter pkgver=1.7.9 --pkgrel=1 ++pkgrel=2 pkgdesc="A screenshot taking application and panel plugin for Xfce4." makedepends=('intltool') -depends=('gtk+2>=2.22.0' 'libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4' \ - 'curl>=7.21.2' 'libsoup>=2.32.2') +depends=('gtk+2>=2.16.2-2' 'libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.4' \ + 'curl>=7.19.5' 'libsoup') groups=('xfce4' 'xfce4-goodies') conflicts=('xfce4-screenshooter-plugin') replaces=('xfce4-screenshooter-plugin') diff --cc source/xfce4/xfce4-systemload-plugin/FrugalBuild index aac55fd,c2b5dd4..000fe58 --- a/source/xfce4/xfce4-systemload-plugin/FrugalBuild +++ b/source/xfce4/xfce4-systemload-plugin/FrugalBuild @@@ -3,9 -3,9 +3,9 @@@ pkgname=xfce4-systemload-plugin pkgver=1.0.0 --pkgrel=1 ++pkgrel=2 pkgdesc="A system load plugin for the Xfce4 panel" -depends=('libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4' 'libxml2') +depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.6' 'libxml2') makedepends=('intltool') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') diff --cc source/xfce4/xfce4-taskmanager/FrugalBuild index 9b6b447,d3476ce..c976ddc --- a/source/xfce4/xfce4-taskmanager/FrugalBuild +++ b/source/xfce4/xfce4-taskmanager/FrugalBuild @@@ -3,10 -3,10 +3,10 @@@ pkgname=xfce4-taskmanager pkgver=1.0.0 --pkgrel=1 ++pkgrel=2 pkgdesc="A GUI taskmanager for Xfce4" url="http://www.xfce.org/"; -depends=('libxfcegui4>=4.6.4') +depends=('libxfcegui4>=4.7.0') makedepends=('intltool') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') diff --cc source/xfce4/xfce4-wavelan-plugin/FrugalBuild index 82a7583,11d12ce..157ccd2 --- a/source/xfce4/xfce4-wavelan-plugin/FrugalBuild +++ b/source/xfce4/xfce4-wavelan-plugin/FrugalBuild @@@ -6,13 -6,12 +6,12 @@@ pkgver=0.5. pkgrel=1 pkgdesc="An Xfce panel plugin to display status from a Wireless LAN interface." makedepends=('intltool') -depends=('libxfcegui4>=4.6.4' 'xfce4-panel>=4.6.4') +depends=('libxfcegui4>=4.7.0' 'xfce4-panel>=4.7.6') groups=('xfce4' 'xfce4-goodies') archs=('i686' 'x86_64' 'ppc') +_F_xfce_goodies_ext=".tar.bz2" _F_xfce_category="panel-plugins" Finclude xfce4 --source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2) sha1sums=('db8566f100eec45252b15e8256f119a123c78a9a') # optimization OK _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
