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