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

2012-04-29 Thread Devil505
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=216dec3bd6ceb674d8f82054282b1a0bbe9c2b35

commit 216dec3bd6ceb674d8f82054282b1a0bbe9c2b35
Merge: 92dac32 08df5cf
Author: Devil505 devil505li...@gmail.com
Date:   Sun Apr 29 08:29:41 2012 +0200

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

Conflicts:
source/xfce4/thunar/FrugalBuild
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2012-01-30 Thread Devil505
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=398fa3673b962f39af8b3ae9e5370e5bad3a455d

commit 398fa3673b962f39af8b3ae9e5370e5bad3a455d
Merge: ff0dbd2 644bbc7
Author: Devil505 devil505li...@gmail.com
Date:   Mon Jan 30 18:23:09 2012 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-12-04 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a7edce1d12888f552a4fd3fbd9c496fd7185cdda

commit a7edce1d12888f552a4fd3fbd9c496fd7185cdda
Merge: 46b8afc 42d1dde
Author: bouleetbil bouleet...@frogdev.info
Date:   Sun Dec 4 13:48:13 2011 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-10-25 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d76d83525c94147bd23b74a69db0ab4981c4f6c7

commit d76d83525c94147bd23b74a69db0ab4981c4f6c7
Merge: 8762743 46cb38e
Author: bouleetbil bouleet...@frogdev.info
Date:   Tue Oct 25 10:43:39 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-10-11 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=968110c3db459e62238352af71e61e928da3fec9

commit 968110c3db459e62238352af71e61e928da3fec9
Merge: b1a4181 71bb7b2
Author: bouleetbil bouleet...@frogdev.info
Date:   Tue Oct 11 09:17:34 2011 +0200

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

diff --cc source/gnome-extra/monodevelop-database/FrugalBuild
index 33a76a4,821838e..5254ea0
--- a/source/gnome-extra/monodevelop-database/FrugalBuild
+++ b/source/gnome-extra/monodevelop-database/FrugalBuild
@@@ -6,12 -6,12 +6,12 @@@ pkgver=2.
pkgrel=1
pkgdesc=Database Extension for MonoDevelop
url=http://www.mono-project.com/;
-depends=('monodevelop=2.6' 'sqlite3' 'mysql-connector-net')
+depends=('monodevelop=2.8' 'sqlite3' 'mysql-connector-net')
makedepends=('intltool' 'perl-xml-parser')
groups=('gnome-extra')
- archs=('i686' 'x86_64' 'ppc')
+ archs=('i686' 'x86_64')
up2date=Flasttar http://download.mono-project.com/sources/$pkgname/;
-source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
options=('scriptlet')
_F_mono_aot=0
Finclude mono
diff --cc source/gnome-extra/monodevelop-java/FrugalBuild
index e0c7f63,99c409a..f8338bc
--- a/source/gnome-extra/monodevelop-java/FrugalBuild
+++ b/source/gnome-extra/monodevelop-java/FrugalBuild
@@@ -6,12 -6,12 +6,12 @@@ pkgver=2.
pkgrel=1
pkgdesc=Java Extension for MonoDevelop
url=http://www.mono-project.com/;
-depends=('monodevelop=2.6')
+depends=('monodevelop=2.8')
makedepends=('intltool' 'perl-xml-parser')
groups=('gnome-extra')
- archs=('i686' 'x86_64' 'ppc')
+ archs=('i686' 'x86_64')
up2date=Flasttar http://download.mono-project.com/sources/$pkgname/;
-source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
options=('scriptlet')
_F_mono_aot=0
Finclude mono
diff --cc source/gnome-extra/monodevelop-python/FrugalBuild
index 2f477c1,2aad1b8..b82aaec
--- a/source/gnome-extra/monodevelop-python/FrugalBuild
+++ b/source/gnome-extra/monodevelop-python/FrugalBuild
@@@ -6,12 -6,12 +6,12 @@@ pkgver=2.
pkgrel=1
pkgdesc=Python Extension for MonoDevelop
url=http://www.mono-project.com/;
-depends=('monodevelop=2.6' 'python=2.7')
+depends=('monodevelop=2.8' 'python=2.7')
makedepends=('intltool' 'perl-xml-parser')
groups=('gnome-extra')
- archs=('i686' 'x86_64' 'ppc')
+ archs=('i686' 'x86_64')
up2date=Flasttar http://download.mono-project.com/sources/$pkgname/;
-source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
options=('scriptlet')
_F_mono_aot=0
Finclude mono
diff --cc source/gnome-extra/monodevelop-vala/FrugalBuild
index 237400c,180b41e..7a866a3
--- a/source/gnome-extra/monodevelop-vala/FrugalBuild
+++ b/source/gnome-extra/monodevelop-vala/FrugalBuild
@@@ -6,12 -6,12 +6,12 @@@ pkgver=2.
pkgrel=1
pkgdesc=Vala Extension for MonoDevelop
url=http://www.mono-project.com/;
-depends=('monodevelop=2.6' 'vala=0.12')
+depends=('monodevelop=2.8' 'vala=0.14')
makedepends=('intltool' 'perl-xml-parser')
groups=('gnome-extra')
- archs=('i686' 'x86_64' 'ppc')
+ archs=('i686' 'x86_64')
up2date=Flasttar http://download.mono-project.com/sources/$pkgname/;
-source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2
 MonoDevelop.ValaBinding.dll.config)
options=('scriptlet')
_F_mono_aot=0
Finclude mono
diff --cc source/gnome-extra/monodevelop/FrugalBuild
index a1fdb6d,ea170f0..b0d018c
--- a/source/gnome-extra/monodevelop/FrugalBuild
+++ b/source/gnome-extra/monodevelop/FrugalBuild
@@@ -10,9 -10,9 +10,9 @@@ depends=('shared-mime-info' 'gtk-sharp
'mono-addins=0.6' 'gnome-sharp' 'gtksourceview-sharp')
makedepends=('intltool' 'perl-xml-parser')
groups=('gnome-extra')
- archs=('i686' 'x86_64' 'ppc')
+ archs=('i686' 'x86_64')
up2date=Flasttar http://download.mono-project.com/sources/$pkgname/;
-source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)

options=('scriptlet')
_F_gnome_desktop=y
diff --cc source/gnome/gdm/FrugalBuild
index 29e3c1c,5bcbde0..29a92b4
--- a/source/gnome/gdm/FrugalBuild
+++ b/source/gnome/gdm/FrugalBuild
@@@ -13,13 -9,13 +13,13 @@@ url=http://www.gnome.org/
backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin \
etc/pam.d/gdm-welcome)
depends=('libxml2=2.7.8' 'zenity=3.0.0'  'libxi' 'fontconfig' 
'libxrandr=1.2.2' \
-'librsvg=2.26.0-2' 'gnome-keyring=3.0.3' 'consolekit-x11=0.4.5' 
'libcanberra-gtk' \
-'libxinerama' 'libxcursor' 'libxevie' 'xorg-server=1.10.2' \
-   'pam' 'accountsservice' 'upower' 'nss' 'hwdata' 'dbus-x11')

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

2011-10-03 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7f9468ae6fe5c942192b8b302ee2e0e30e4019fb

commit 7f9468ae6fe5c942192b8b302ee2e0e30e4019fb
Merge: 28b86e2 e549648
Author: bouleetbil bouleet...@frogdev.info
Date:   Mon Oct 3 09:31:44 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-09-05 Thread James Buren
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=44a612540660c43541c8714baf6518de90c69b2a

commit 44a612540660c43541c8714baf6518de90c69b2a
Merge: ad7351b bca8b88
Author: James Buren r...@frugalware.org
Date:   Mon Sep 5 14:27:17 2011 -0500

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-09-02 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2efe4b34b62c6a03052e9bd78336b80b88e1f17d

commit 2efe4b34b62c6a03052e9bd78336b80b88e1f17d
Merge: 0131048 a2bd3fd
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri Sep 2 10:24:30 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-08-26 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7a84c209bbcb7bd81c1f3315470984f5d81c8c42

commit 7a84c209bbcb7bd81c1f3315470984f5d81c8c42
Merge: 47b1bbc f448b3e
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri Aug 26 10:38:00 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-08-26 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=535df043e7e4c45690629e66b89f73555a801215

commit 535df043e7e4c45690629e66b89f73555a801215
Merge: 79a5fc6 7a84c20
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri Aug 26 10:47:08 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-07-15 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1b3748df8ef3eca0881104e622b48d5276ddc332

commit 1b3748df8ef3eca0881104e622b48d5276ddc332
Merge: f05f26c 7a593d0
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri Jul 15 13:36:52 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-06-24 Thread Devil505
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=245fe67eb719207d0b3b8a2299bd820343913ce9

commit 245fe67eb719207d0b3b8a2299bd820343913ce9
Merge: a5f45ee d16c124
Author: Devil505 devil505li...@gmail.com
Date:   Fri Jun 24 17:04:03 2011 +0200

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

Conflicts:
source/apps-extra/tyrs/FrugalBuild

diff --cc source/apps-extra/tyrs/FrugalBuild
index 1e5526e,6d7e429..2893b50
--- a/source/apps-extra/tyrs/FrugalBuild
+++ b/source/apps-extra/tyrs/FrugalBuild
@@@ -7,10 -7,9 +7,9 @@@ pkgrel=
pkgdesc=A lightweight console Twitter and Identica client using ncurses and 
Python.
url=http://tyrs.nicosphere.net/;
depends=('python-twitter=0.8.2-2' 'python-httplib2')
-makedepends=('setuptools' 'python-distutils-extra' 'intltool')
+makedepends=('distribute' 'python-distutils-extra' 'intltool')
groups=('apps-extra')
archs=('i686' 'x86_64')
- up2date=Flasttar $url
- 
source=http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz;
+ Finclude pypi
sha1sums=('53054488a1c5fce9b0c5a9713742d8ca42d7dc49')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-05-11 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0597b2006646d9c4763ee8f8b7df32ac0140d939

commit 0597b2006646d9c4763ee8f8b7df32ac0140d939
Merge: 4032cc1 97428ad
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed May 11 20:45:18 2011 +0200

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

Conflicts:
source/gnome/eog/FrugalBuild

diff --cc source/gnome/eog/FrugalBuild
index 238cdf4,8b8a2e3..d6204f2
--- a/source/gnome/eog/FrugalBuild
+++ b/source/gnome/eog/FrugalBuild
@@@ -3,11 -3,11 +3,11 @@@
# Contributor: Christian Hamar alias krix kr...@linuxforum.hu

pkgname=eog
- pkgver=3.1.1
+ pkgver=3.0.1
-pkgrel=1
+pkgrel=2
pkgdesc=An image viewing and cataloging program for GNOME
depends=('libxml2=2.7.8' 'libexif' 'rarian' 'desktop-file-utils' 'python=2.7' 
\
-'gnome-desktop=3.0.1' 'lcms2' 'libart_lgpl' 'libpeas-gtk')
+'gnome-desktop=3.0.1' 'lcms' 'libart_lgpl' 'libpeas-gtk')
makedepends=('intltool' 'gnome-doc-utils=0.16.0')
groups=('gnome')
archs=('i686' 'x86_64' 'ppc')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-04-27 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4caf98aae9782b07ac8124d31b8cad2b0ec38a14

commit 4caf98aae9782b07ac8124d31b8cad2b0ec38a14
Merge: 309128b 60d4288
Author: bouleetbil bouleet...@frogdev.info
Date:   Wed Apr 27 20:57:26 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-04-08 Thread bouleetbil
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4233756df43f96a3b1f2dd752f2f69b99d04efce

commit 4233756df43f96a3b1f2dd752f2f69b99d04efce
Merge: 4712a5d 2957881
Author: bouleetbil bouleet...@frogdev.info
Date:   Fri Apr 8 14:06:12 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-03-17 Thread Krisztian VASAS
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21d3189e6e82a24021e1c5cdfdd7e03d992681a0

commit 21d3189e6e82a24021e1c5cdfdd7e03d992681a0
Merge: 4ca3b63 85e5cd7
Author: Krisztian VASAS i...@frugalware.org
Date:   Thu Mar 17 13:07:40 2011 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-02-19 Thread Krisztian VASAS
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3ac98d6b95ffc3d2392975d5a6f94e84d36ba91b

commit 3ac98d6b95ffc3d2392975d5a6f94e84d36ba91b
Merge: c564d75 22b769b
Author: Krisztian VASAS i...@frugalware.org
Date:   Sat Feb 19 15:47:59 2011 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2011-01-04 Thread Krisztian VASAS
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ab8772189566a7844df361ce801a6a0bf49a8021

commit ab8772189566a7844df361ce801a6a0bf49a8021
Merge: 02fc7cc b30bbe8
Author: Krisztian VASAS i...@frugalware.org
Date:   Tue Jan 4 18:37:04 2011 +0100

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


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

2010-09-03 Thread Miklos Vajna
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=064e9323f1a91fc52dbe824fe07ea37a78e2f93d

commit 064e9323f1a91fc52dbe824fe07ea37a78e2f93d
Merge: 6f1ebf1 46f1d4f
Author: Miklos Vajna vmik...@frugalware.org
Date:   Fri Sep 3 12:58:51 2010 +0200

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

* 'master' of git.frugalware.org:/pub/frugalware/frugalware-current: (23 
commits)

Conflicts:
source/lib/libproxy/FrugalBuild

diff --cc source/lib/libproxy/FrugalBuild
index 266de60,c8c4770..4f4cec4
--- a/source/lib/libproxy/FrugalBuild
+++ b/source/lib/libproxy/FrugalBuild
@@@ -2,8 -2,8 +2,8 @@@
# Maintainer: bouleetbil bouleet...@frogdev.info

pkgname=libproxy
- pkgver=0.4.5
+ pkgver=0.4.6
-pkgrel=1
+pkgrel=2
pkgdesc=libproxy is a library that provides automatic proxy configuration 
management.
depends=('glibc' 'dbus')
makedepends=('automoc4')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git