Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=ba15f602840512cb9ba9c48658e6bd938f384509

commit ba15f602840512cb9ba9c48658e6bd938f384509
Merge: c9743ce 4ab85c0
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sun Oct 3 18:27:56 2010 +0000

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

Conflicts:
source/xapps-extra/texlive/FrugalBuild

diff --cc source/xapps-extra/texlive/FrugalBuild
index 0cad5f0,0f84296..75d12ed
--- a/source/xapps-extra/texlive/FrugalBuild
+++ b/source/xapps-extra/texlive/FrugalBuild
@@@ -2,24 -2,20 +2,20 @@@
# Maintainer: Elentir <elen...@frugalware.org>

pkgname=texlive
- pkgver=20091107
- pkgrel=5
+ pkgver=20100722
-pkgrel=1
++pkgrel=2
pkgdesc="A complete TeX distribution"
archs=('i686' 'x86_64' 'ppc')
- depends=('t1lib' 'gd' 'ncurses' 'poppler>=0.14.3')
-depends=('t1lib' 'gd' 'ncurses' 'poppler' 'icu4c>=4.2')
++depends=('t1lib' 'gd' 'ncurses' 'poppler>=0.14.3' 'icu4c>=4.2')
+ rodepends=('ghostscript')
makedepends=('clisp' 'ffcall')
url='http://tug.org/texlive/'
- 
source=("ftp://tug.org/historic/systems/texlive/2009/$pkgname-$pkgver-source.tar.xz";
 \
-       
"ftp://tug.org/historic/systems/texlive/2009/$pkgname-$pkgver-texmf.tar.xz"; \
-       texlive-poppler-0.12.patch \
+ 
source=("ftp://tug.org/historic/systems/texlive/2010/$pkgname-$pkgver-source.tar.xz";
 \
+       
"ftp://tug.org/historic/systems/texlive/2010/$pkgname-$pkgver-texmf.tar.xz"; \
fix-fontforge-encoding.patch \
-       texlive-libpng14.patch \
-       texlive.install \
-       texlive-pkg.install \
-       texlive-pkg-nomaps.install \
-       texmf.cnf \
-       xindy-clisp-2.49.patch)
- up2date="Flasttar ftp://tug.org/historic/systems/texlive/2009/ | sed 
's/-source//' | sed 's/_texmf//'"
+       texmf.cnf
+       09-texlive.conf)
+ up2date="Flasttar ftp://tug.org/historic/systems/texlive/2010/ | sed 
's/-source//' | sed 's/_texmf//' | sed 's/_extra//'"
groups=('xapps-extra')
conflicts=('tetex' 'tetex-kpathsea')
provides=('tetex' 'tetex-kpathsea')
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to