Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=2bd8968cc24bb65937f14a8798568d5d091f2730

commit 2bd8968cc24bb65937f14a8798568d5d091f2730
Merge: 0e24b1c e49a6a0
Author: crazy <cr...@frugalware.org>
Date:   Sun Feb 4 13:31:58 2018 +0100

Merge branch 'master' of git.frugalware.org:/pub/other/people/dex77/kernelbump

Conflicts:
source/base/btrfs-progs/FrugalBuild
source/base/ethtool/FrugalBuild

diff --cc source/base/btrfs-progs/FrugalBuild
index 7f24fcf,7d33a2e..b37a306
--- a/source/base/btrfs-progs/FrugalBuild
+++ b/source/base/btrfs-progs/FrugalBuild
@@@ -2,12 -2,12 +2,12 @@@
# Maintainer: James Buren <r...@frugalware.org>

pkgname=btrfs-progs
- pkgver=4.14.1
- pkgrel=2
+ pkgver=4.15
+ pkgrel=1
pkgdesc="Utilities for managing btrfs filesystems."
url="https://btrfs.wiki.kernel.org";
-depends=('e2fsprogs>=1.43.4-3' 'lzo>=2.09-5' 'zstd')
-makedepends=('xfsprogs-attr>=2.4.47-7' 'xfsprogs-acl>=2.2.52-6' \
+depends=('e2fsprogs>=1.43.8-2' 'lzo>=2.10-3' 'zstd>=1.3.3-2')
+makedepends=('xfsprogs-attr>=2.4.47-8' 'xfsprogs-acl>=2.2.52-7' \
'asciidoc>=8.6.9-2' 'xmlto>=0.0.28' 'docbook-xsl')
groups=('base')
archs=('x86_64')
diff --cc source/base/ethtool/FrugalBuild
index ca5352b,abac256..be580ec
--- a/source/base/ethtool/FrugalBuild
+++ b/source/base/ethtool/FrugalBuild
@@@ -3,10 -3,10 +3,10 @@@
# Maintainer: crazy <cr...@frugalware.org>

pkgname=ethtool
- pkgver=4.13
- pkgrel=2
+ pkgver=4.15
+ pkgrel=1
pkgdesc="A tool for setting ethernet parameters"
-depends=('glibc>=2.25')
+depends=('glibc>=2.26.9000-3')
groups=('base')
archs=("x86_64")
url="http://www.kernel.org/pub/software/network/ethtool/";
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to