Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=6b56a22554450a25a56a6174ed7643246199df31

commit 6b56a22554450a25a56a6174ed7643246199df31
Merge: 800f537 b603d7a
Author: VÖRÖSKŐI András <voros...@frugalware.org>
Date:   Mon Jul 5 17:12:44 2010 +0200

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

Conflicts:
source/base/pacman-g2/FrugalBuild
merge in pacman-g2 fixes

diff --cc source/base/pacman-g2/FrugalBuild
index 25a7a7a,ec0f9c4..fb60fdf
--- a/source/base/pacman-g2/FrugalBuild
+++ b/source/base/pacman-g2/FrugalBuild
@@@ -7,11 -8,11 +8,11 @@@ USE_MINIMAL=${USE_MINIMAL:-"n"
pkgname=pacman-g2
pkgver=3.7.7
Fuse $USE_DEVEL && pkgver=3.7.3.32.gedb838c
--pkgrel=5
- pkgdesc="A .tar.bz2 based package manager library (libpacman) and client 
(pacman-g2) with dependency support."
++pkgrel=6
+ pkgdesc="A .tar.xz based package manager library (libpacman) and client 
(pacman-g2) with dependency support."
url="http://ftp.frugalware.org/pub/other/pacman-g2/";
backup=(etc/{makepkg,pacman-g2}.conf 
etc/pacman-g2/repos/{frugalware,frugalware-current})
-depends=('libarchive>=2.7.1' 'glibc>=2.8-3' 'grep>=2.5.3-4' 
'util-linux-ng>=2.14-2')
+depends=('libarchive>=2.8.3-4' 'glibc>=2.8-3' 'grep>=2.5.3-4' 
'util-linux-ng>=2.14-2')
if ! Fuse $USE_MINIMAL; then
makedepends=('doxygen' 'po4a' 'swig' \
'java-gcj-compat>=1.0.77-2' 'ecj>=3.3.2-2' 'mono' 'asciidoc' 'docbook-xsl' \
@@@ -27,9 -28,9 +28,10 @@@ up2date="Flasttar $url/releases/
if ! Fuse $USE_DEVEL; then
source=($url/releases/$pkgname-$pkgver.tar.gz \
http://git.frugalware.org/patches/pacman-g2/ab6bee9.patch \
+               http://git.frugalware.org/patches/pacman-g2/3c97a0c.patch \
-               0001-fix-percent-calculation.patch)
-       signatures=("$source.asc" '' '' '')
+               0001-fix-percent-calculation.patch \
+               0002-fix-ccache.patch)
-       signatures=("$source.asc" '' '' '')
++      signatures=("$source.asc" '' '' '' '')
else
_F_scm_type="git"
_F_scm_url="git://git.frugalware.org/pub/other/pacman-g2/pacman-g2"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to