Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=7f07a8f798c39d8f03bfdc3f7a381a716f66f37b

commit 7f07a8f798c39d8f03bfdc3f7a381a716f66f37b
Merge: cc2302a ce26370
Author: Devil505 <[email protected]>
Date:   Fri Dec 30 23:05:16 2011 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/xfce4/libxfce4ui/FrugalBuild
source/xfce4/xfce4-settings/FrugalBuild

diff --cc source/xfce4/libxfce4ui/FrugalBuild
index ec25d09,8508570..3ed0759
--- a/source/xfce4/libxfce4ui/FrugalBuild
+++ b/source/xfce4/libxfce4ui/FrugalBuild
@@@ -18,6 -18,7 +18,8 @@@ sha1sums=('408645581e589135aa03d2e9b84f
#replaces=('libxfcegui4')
#provides=('libxfcegui4')
#conflicts=('libxfcegui4')
- 
source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+ # bug fix release
+ 
source=(http://archive.xfce.org/src/xfce/libxfce4ui/4.8/$pkgname-$pkgver.tar.bz2)

# optimization OK
++
diff --cc source/xfce4/xfce4-settings/FrugalBuild
index e31b686,010079c..a2f7570
--- a/source/xfce4/xfce4-settings/FrugalBuild
+++ b/source/xfce4/xfce4-settings/FrugalBuild
@@@ -28,3 -28,3 +28,4 @@@ source=($source
${pkgname}-4.8.0-lcdfilter.patch)

# optimization OK
++
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to