[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 7c4851435cb0d4a41d857ac7f01f1c7c558844af

[git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".

The branch, master has been updated
       via  7c4851435cb0d4a41d857ac7f01f1c7c558844af (commit)
       via  2a8ab07e43bac81a9900ad7e2615d9ba3e6c5042 (commit)
       via  f7b2c7291cbb8b1d92061502d97bbde639474411 (commit)
       via  73ace208ab2a9fc10b94c22eda3f007584ffa800 (commit)
       via  0cce40dc2744c128086b08e875d7f394e5917b18 (commit)
      from  f001dfd6eb2d8b4d309ec728d77a9da3009ad8dd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7c4851435cb0d4a41d857ac7f01f1c7c558844af
Author: Chris Staub <chris at beaker67.com>
Date:   Thu Oct 25 07:20:38 2012 -0400

    Updated date

diff --git a/BOOK/general.ent b/BOOK/general.ent
index 789249f..87044cb 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
 
 <!ENTITY month "10"> <!-- Use two digits -->
 <!ENTITY month_name "October">
-<!ENTITY day "23"> <!-- Use two digits -->
+<!ENTITY day "25"> <!-- Use two digits -->
 <!ENTITY year "2012"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">

commit 2a8ab07e43bac81a9900ad7e2615d9ba3e6c5042
Merge: f7b2c72 f001dfd
Author: Chris Staub <chris at beaker67.com>
Date:   Thu Oct 25 07:17:24 2012 -0400

    Merge branch 'master' of git.cross-lfs.org:cross-lfs


commit f7b2c7291cbb8b1d92061502d97bbde639474411
Merge: 73ace20 83c5afd
Author: Chris Staub <chris at beaker67.com>
Date:   Wed Oct 17 00:32:25 2012 -0400

    Merge branch 'master' of git.cross-lfs.org:cross-lfs


commit 73ace208ab2a9fc10b94c22eda3f007584ffa800
Merge: 0cce40d 80cbd64
Author: Chris Staub <chris at beaker67.com>
Date:   Wed Oct 10 21:42:21 2012 -0400

    Merge branch 'master' of git.cross-lfs.org:cross-lfs


commit 0cce40dc2744c128086b08e875d7f394e5917b18
Author: Chris Staub <chris at beaker67.com>
Date:   Sun Dec 11 16:04:10 2011 -0500

    Added patch for Patch

diff --git a/patches/patch-2.6.1-test_fix-1.patch b/patches/patch-2.6.1-test_fix-1.patch
new file mode 100644
index 0000000..d80f766
--- /dev/null
+++ b/patches/patch-2.6.1-test_fix-1.patch
@@ -0,0 +1,28 @@
+Submitted by:            Matt Burgess <matthew at linuxfromscratch.org>
+Date:                    2010-01-03
+Initial Package Version: 2.6.1
+Upstream Status:         Submitted
+Origin:                  Matt Burgess
+Description:             Prevents a test from failing when ed is not available.
+
+diff -Naur patch-2.6.1.orig/tests/crlf-handling patch-2.6.1/tests/crlf-handling
+--- patch-2.6.1.orig/tests/crlf-handling	2009-12-30 12:56:30.000000000 +0000
++++ patch-2.6.1/tests/crlf-handling	2010-01-03 11:06:00.340849916 +0000
+@@ -89,10 +89,14 @@
+ 
+ # --------------------------------------------------------------
+ 
+-diff -e a b > ab.diff
+-cp a c
+-check 'patch c < ab.diff' <<EOF
++if ! have_ed ; then
++    echo "The ed utility is not available; skipping ed related tests"
++else
++    diff -e a b > ab.diff
++    cp a c
++    check 'patch c < ab.diff' <<EOF
+ EOF
++fi
+ 
+ check 'cat -A c' <<EOF
+ 1b^M$

-----------------------------------------------------------------------

Summary of changes:
 BOOK/general.ent |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book