Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kikadftesting.git;a=commitdiff;h=b0b03fd5f2db420add81e391fc520b2343c7310e
commit b0b03fd5f2db420add81e391fc520b2343c7310e Author: kikadf <[email protected]> Date: Fri Apr 4 16:28:28 2014 +0200 gnuplot-4.6.5-2-x86_64 * Version bump (wxwidget) diff --git a/source/xapps-extra/gnuplot/FrugalBuild b/source/xapps-extra/gnuplot/FrugalBuild index b8ed24f..1333662 100644 --- a/source/xapps-extra/gnuplot/FrugalBuild +++ b/source/xapps-extra/gnuplot/FrugalBuild @@ -4,13 +4,8 @@ options+=('asneeded') pkgname=gnuplot -<<<<<<< HEAD -pkgver=4.6.4 -pkgrel=3 -======= pkgver=4.6.5 -pkgrel=1 ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f +pkgrel=2 pkgdesc="Gnuplot is a portable command-line driven interactive data and function plotting utility." # libxaw necessary for x11 support makedepends=('libxaw') diff --git a/source/xapps-extra/gnuplot/FrugalBuild.orig b/source/xapps-extra/gnuplot/FrugalBuild.orig deleted file mode 100644 index b8ed24f..0000000 --- a/source/xapps-extra/gnuplot/FrugalBuild.orig +++ /dev/null @@ -1,25 +0,0 @@ -# Compiling Time: 0.32 SBU -# Maintainer: Melko <[email protected]> - -options+=('asneeded') - -pkgname=gnuplot -<<<<<<< HEAD -pkgver=4.6.4 -pkgrel=3 -======= -pkgver=4.6.5 -pkgrel=1 ->>>>>>> e99a9cf95b1548f0d2dac0cd2adf6db0345c095f -pkgdesc="Gnuplot is a portable command-line driven interactive data and function plotting utility." -# libxaw necessary for x11 support -makedepends=('libxaw') -depends=('svgalib' 'gd>=2.0.35-2' 'pango' 'wxwidget') -groups=('xapps-extra') -archs=('i686' 'x86_64') -Finclude sourceforge -url="http://www.gnuplot.info/" -sha1sums=('a74558d145344422674dea4f58c9cb0931872c36') -unset Fbuildchost - -# optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
