Merge branch '2.5' into 2.6
Conflicts: util-linux-ng/.md5sum util-linux-ng/Pkgfile
This commit is contained in:
commit
ac722ca944
|
@ -1 +1 @@
|
|||
dc5eb45e38ea335fdca80aa488fffc48 util-linux-ng-2.15.1-rc1.tar.bz2
|
||||
a06d94c4dc94c56a636c6e456698e40d util-linux-ng-2.15.1.tar.bz2
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
# Depends on: e2fsprogs, ncurses, zlib
|
||||
|
||||
name=util-linux-ng
|
||||
version=2.15.1-rc1
|
||||
release=1
|
||||
version=2.15.1
|
||||
release=2
|
||||
source=(http://ftp.kernel.org/pub/linux/utils/$name/v2.15/$name-$version.tar.bz2)
|
||||
|
||||
build() {
|
||||
|
|
Loading…
Reference in New Issue
Block a user