Merge branch '2.2' into 2.3

2006-11-21 10:27:24 +01:00 · 2006-11-21 10:27:24 +01:00 · a2b42aade2
commit a2b42aade2
parent 97e648c03e 9590bdd1b1
5 changed files with 5 additions and 5 deletions
--- a/m4/.md5sum
+++ b/m4/.md5sum
@ -1 +1 @@
-0115a354217e36ca396ad258f6749f51  m4-1.4.7.tar.bz2
+6bbf917e5d8fab20b38d43868c3944d3  m4-1.4.8.tar.bz2
--- a/m4/Pkgfile
+++ b/m4/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer:  Per Lidén, core-ports at crux dot nu

 name=m4
-version=1.4.7
+version=1.4.8
 release=1
 source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.bz2)

--- a/man/.md5sum
+++ b/man/.md5sum
@ -1,3 +1,3 @@
 a5617e86e5fb22dc38e40e1cd5ef00a4  makewhatis
-c3c75a115b15dc70be216d8e7cee9a19  man-1.6d.patch
-36d3f65bcc10f0754a3234e00d92ad6d  man-1.6d.tar.gz
+c3c75a115b15dc70be216d8e7cee9a19  man-1.6e.patch
+d8187cd756398baefc48ba7d60ff6a8a  man-1.6e.tar.gz
--- a/man/Pkgfile
+++ b/man/Pkgfile
@ -3,7 +3,7 @@
 # Maintainer:  Per Lidén, core-ports at crux dot nu

 name=man
-version=1.6d
+version=1.6e
 release=1
 source=(http://primates.ximian.com/~flucifredi/man/$name-$version.tar.gz \
 	makewhatis $name-$version.patch)
--- a/man/man-1.6e.patch
+++ b/man/man-1.6e.patch