Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfce46.git;a=commitdiff;h=dd220113440a0ba77ea00e7f97001debc2ef549a
commit dd220113440a0ba77ea00e7f97001debc2ef549a
Merge: 96dfe01 ab10734
Author: Priyank <priy...@frugalware.org>
Date: Sun Jun 7 22:08:14 2009 +0530
Merge branch 'master' of
git://git.frugalware.org/pub/frugalware/frugalware-current
Conflicts:
source/include/xfce4.sh
source/xfce4-extra/thunar-thumbnailers/FrugalBuild
source/xfce4/gtk-xfce-engine/FrugalBuild
source/xfce4/libexo/FrugalBuild
source/xfce4/libxfce4mcs/FrugalBuild
source/xfce4/libxfce4util/FrugalBuild
source/xfce4/libxfcegui4/FrugalBuild
source/xfce4/mousepad/FrugalBuild
source/xfce4/orage/FrugalBuild
source/xfce4/slim/FrugalBuild
source/xfce4/terminal/FrugalBuild
source/xfce4/thunar/FrugalBuild
source/xfce4/xfce-mcs-manager/FrugalBuild
source/xfce4/xfce-mcs-plugins/FrugalBuild
source/xfce4/xfce-utils/FrugalBuild
source/xfce4/xfce4-appfinder/FrugalBuild
source/xfce4/xfce4-icon-theme/FrugalBuild
source/xfce4/xfce4-panel/FrugalBuild
source/xfce4/xfce4-session/FrugalBuild
source/xfce4/xfdesktop/FrugalBuild
source/xfce4/xfdesktop/xfce4_frugalware.patch
source/xfce4/xfprint/FrugalBuild
source/xfce4/xfwm4-themes/FrugalBuild
source/xfce4/xfwm4/FrugalBuild
diff --cc source/xfce4-extra/thunar-thumbnailers/FrugalBuild
index 8c2a413,e15216f..20909e1
--- a/source/xfce4-extra/thunar-thumbnailers/FrugalBuild
+++ b/source/xfce4-extra/thunar-thumbnailers/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@
pkgname=thunar-thumbnailers
pkgver=0.4.1
- pkgrel=1
+ pkgrel=2
pkgdesc="Additional thumbnailers for Thunar file manager."
makedepends=('intltool')
-depends=('thunar>=0.9.0' 'ffmpegthumbnailer' 'dcraw' 'imagemagick>=6.4.8_9')
+depends=('thunar>=1.0.1' 'ffmpegthumbnailer' 'dcraw' 'imagemagick')
groups=('xfce4-extra' 'xfce4-goodies')
_F_xfce_goodies_ext=".tar.bz2"
Finclude xfce4
diff --cc source/xfce4/xfce4-icon-theme/FrugalBuild
index afe4219,db1e064..dc6e3b7
--- a/source/xfce4/xfce4-icon-theme/FrugalBuild
+++ b/source/xfce4/xfce4-icon-theme/FrugalBuild
@@@ -3,14 -3,11 +3,13 @@@
pkgname=xfce4-icon-theme
pkgver=4.4.3
-pkgrel=1
+pkgrel=2
pkgdesc="Default icon theme for Xfce4."
-depends=()
makedepends=('intltool')
+depends=()
groups=('xfce4' 'xfce4-core')
archs=('i686' 'x86_64')
+_F_xfce_ver=$pkgver
Finclude xfce4
+up2date=$pkgver
sha1sums=('0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7')
-
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
