Merge branch '2.2' into 2.3

Conflicts: xfsprogs/.md5sum xfsprogs/Pkgfile
2006-12-13 11:36:46 +01:00 · 2006-12-13 11:36:46 +01:00 · 554e3d9d6b
commit 554e3d9d6b
parent e37f61fe4f aa52207108
4 changed files with 4 additions and 4 deletions
--- a/file/.md5sum
+++ b/file/.md5sum
@ -1 +1 @@
-ce1aa9b0316feb57d40a48cfe6b606e4  file-4.18.tar.gz
+a61ef3aa8339d5987148089afde25f60  file-4.19.tar.gz
--- a/file/Pkgfile
+++ b/file/Pkgfile
@ -5,7 +5,7 @@
 # Depends on:  zlib

 name=file
-version=4.18
+version=4.19
 release=1
 source=(ftp://ftp.astron.com/pub/file/$name-$version.tar.gz)

--- a/xfsprogs/.md5sum
+++ b/xfsprogs/.md5sum
@ -1 +1 @@
-632c7745f884dc5e6fd707a18971aca3  xfsprogs_2.8.16-1.tar.gz
+6ce9e198cc79ebec6f6fb1f34ffa7709  xfsprogs_2.8.18-1.tar.gz
--- a/xfsprogs/Pkgfile
+++ b/xfsprogs/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  e2fsprogs

 name=xfsprogs
-version=2.8.16
+version=2.8.18
 release=1
 source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/${name}_${version}-1.tar.gz)