[Lunar-commits] <moonbase> patch: version bumped to 2.6.1.

Florin Braescu florin at lunar-linux.org
Thu Jan 14 22:28:18 CET 2010


commit 05e533213c6bfb7483b77dbcb210efa75a84e423
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Thu Jan 14 23:28:18 2010 +0200

    patch: version bumped to 2.6.1.
    
    Changes:
    * Support for diff3(1) style merges which show the old, original, and new
      lines of a conflict has been added (--merge=diff3). The default still is
      the merge(1) format (--merge or --merge=merge).
    * Bug and portability fixes.
---
 devel/patch/DETAILS |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/devel/patch/DETAILS b/devel/patch/DETAILS
index 769664f..2000266 100644
--- a/devel/patch/DETAILS
+++ b/devel/patch/DETAILS
@@ -1,12 +1,12 @@
            MODULE=patch
-         VERSION=2.6
+         VERSION=2.6.1
           SOURCE=$MODULE-$VERSION.tar.gz
    SOURCE_URL[0]=$GNU_URL/$MODULE
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE
-      SOURCE_VFY=sha1:c30bcea10faea7f4e16aa4614742d119257dd4cc
+      SOURCE_VFY=sha1:a50deb8cb6daa5e2997e7a9a36adb78980f95332
         WEB_SITE=http://www.gnu.org/software/patch/patch.html
          ENTERED=20010922
-         UPDATED=20091120
+         UPDATED=20100114
            SHORT="patch applies a patch to a file"
 
 cat << EOF


More information about the Lunar-commits mailing list