[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-08 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=82a63943d2b0d61b693959ee631b0c0656ebadcf

commit 82a63943d2b0d61b693959ee631b0c0656ebadcf
Merge: 3c1fe88 7062a3a
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Dec 9 00:47:48 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-08 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=9cc85a3dd5e88481a571ad174b8ee8aaa2edb9a3

commit 9cc85a3dd5e88481a571ad174b8ee8aaa2edb9a3
Merge: d64288b 0648d3e
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Dec 9 00:59:53 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-07 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=c140e2b789d7a74f5a74cf79b5b71531ba1f75bd

commit c140e2b789d7a74f5a74cf79b5b71531ba1f75bd
Merge: fad151f eac4858
Author: Miklos Vajna vmik...@frugalware.org
Date:   Tue Dec 7 13:34:01 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-07 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=3098c930c5cb2e2818df22040040e23297a6f193

commit 3098c930c5cb2e2818df22040040e23297a6f193
Merge: f6051d0 3874bdf
Author: Miklos Vajna vmik...@frugalware.org
Date:   Tue Dec 7 17:57:47 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-06 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=6fe7a85054c84ae8fbede6373c29a7b18230046d

commit 6fe7a85054c84ae8fbede6373c29a7b18230046d
Merge: 8cd9bf8 3efae4a
Author: Miklos Vajna vmik...@frugalware.org
Date:   Mon Dec 6 13:39:46 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-06 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=8849e552aa47fd8e27981391607d69066f2bc280

commit 8849e552aa47fd8e27981391607d69066f2bc280
Merge: 93925d0 071cfe4
Author: Miklos Vajna vmik...@frugalware.org
Date:   Tue Dec 7 01:08:55 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-06 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=fecd8ce75532db381d458f7538f360d11e122bda

commit fecd8ce75532db381d458f7538f360d11e122bda
Merge: e6423e0 1e863f3
Author: Miklos Vajna vmik...@frugalware.org
Date:   Tue Dec 7 01:32:04 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-06 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=547798368d855f3cc6fc426516bd347daeb2e4ba

commit 547798368d855f3cc6fc426516bd347daeb2e4ba
Merge: 0ec801b 8091852
Author: Miklos Vajna vmik...@frugalware.org
Date:   Tue Dec 7 01:55:38 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-06 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=d4bddc2dd0bb7f7a6d3fd80da5e161fb412a32ab

commit d4bddc2dd0bb7f7a6d3fd80da5e161fb412a32ab
Merge: e217a89 db40272
Author: Miklos Vajna vmik...@frugalware.org
Date:   Tue Dec 7 03:16:20 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-05 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=16ed4990bc42ccf76d547fdfdbc1395971006e87

commit 16ed4990bc42ccf76d547fdfdbc1395971006e87
Merge: 49fe3f3 74688d6
Author: Miklos Vajna vmik...@frugalware.org
Date:   Mon Dec 6 01:06:30 2010 +0100

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

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-04 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=327765f06ad3f4aef1e904225fad2f9f5e47432f

commit 327765f06ad3f4aef1e904225fad2f9f5e47432f
Merge: a87f2af 6adee2e
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sat Dec 4 14:32:56 2010 +0100

Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

Conflicts:
source/base/udev/FrugalBuild
source/base/udev/rc.udev
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] systemd: Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

2010-12-01 Thread Miklos Vajna 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=467ff0a80ff110afbfcb2e694a8b23290a424286

commit 467ff0a80ff110afbfcb2e694a8b23290a424286
Merge: aeab407 3f43ca2
Author: Miklos Vajna vmik...@frugalware.org
Date:   Thu Dec 2 01:05:07 2010 +0100

Merge branch 'master' of genesis:/pub/frugalware/frugalware-current

Conflicts:
source/base/frugalwareutils/FrugalBuild

diff --cc source/base/frugalwareutils/FrugalBuild
index 03ded57,6138951..9f69e511
--- a/source/base/frugalwareutils/FrugalBuild
+++ b/source/base/frugalwareutils/FrugalBuild
@@@ -7,7 -7,7 +7,7 @@@ USE_APIDOCS=${USE_APIDOCS:-y
pkgname=frugalwareutils
pkgver=0.9.2
Fuse $USE_DEVEL  pkgver=0.8.7.6.g3d85830
--pkgrel=2
++pkgrel=3
pkgdesc=Frugalware configuration utilities.
url=http://ftp.frugalware.org/pub/other/frugalwareutils;
depends=('glib2=2.16.4-2' 'ncurses=5.6-4' 'parted=1.8.8-3' \
@@@ -20,8 -20,10 +20,10 @@@ replaces=('kxgenerator'
archs=('i686' 'x86_64' 'ppc')
up2date=lynx -dump $url|Flasttar
if ! Fuse $USE_DEVEL; then
-   source=($url/$pkgname-$pkgver.tar.gz network.service)
-   signatures=(${source[0]}.asc '')
-   source=($url/$pkgname-$pkgver.tar.gz \
++  source=($url/$pkgname-$pkgver.tar.gz network.service \
+   
http://git.frugalware.org/patches/frugalwareutils/2f1045bd15b173cd3dc07eb0251aaed48c97503f.patch
 \
+   
http://git.frugalware.org/patches/frugalwareutils/ea72e89ffaec0d2948a8f4fd7d61119769bcf54d.patch)
-   signatures=(${source[0]}.asc '' '')
++  signatures=(${source[0]}.asc '' '' '')
else
_F_scm_type=git
_F_scm_url=git://git.frugalware.org/pub/other/frugalwareutils/frugalwareutils
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git