The following commit has been merged in the master branch: commit 2eb058de8d2c32e9a57204e4ad357a39e56a6abc Author: Marco Nelles <marco.nel...@credativ.de> Date: Tue Jun 5 10:52:22 2012 +0200
Removed spelling_errors.patch diff --git a/debian/patches/series b/debian/patches/series index 8f0a798..35cfc77 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,7 +15,6 @@ fix-oot-builds.patch #no-strict-aliasing.patch fix-bashisms-for-dash.patch #fix_dentry_conf_test.patch -#spelling_errors.patch #cacheflush_remove_mark_rodata.patch #615749_no_add_needed #modified-debian-specific-stuff.patch diff --git a/debian/patches/spelling_errors.patch b/debian/patches/spelling_errors.patch deleted file mode 100644 index 5555947..0000000 --- a/debian/patches/spelling_errors.patch +++ /dev/null @@ -1,28 +0,0 @@ -#fix some spelling errors in some lustre files - -Index: lustre/lustre/tests/multiop.c -=================================================================== ---- lustre.orig/lustre/tests/multiop.c 2010-12-10 13:35:15.726428000 +0100 -+++ lustre/lustre/tests/multiop.c 2010-12-10 13:35:51.294428000 +0100 -@@ -290,7 +290,7 @@ - break; - case 'M': - if (st.st_size == 0) { -- fprintf(stderr, "mmap without preceeding stat, or on" -+ fprintf(stderr, "mmap without preceding stat, or on" - " zero length file.\n"); - exit(-1); - } -Index: lustre/lustre/utils/lfs.c -=================================================================== ---- lustre.orig/lustre/utils/lfs.c 2010-12-10 13:37:15.026428001 +0100 -+++ lustre/lustre/utils/lfs.c 2010-12-10 13:37:40.238428000 +0100 -@@ -1229,7 +1229,7 @@ - } - size = lseek(fd, 0, SEEK_END); - if (size % JOIN_FILE_ALIGN) { -- fprintf(stderr,"head file %s size %llu must be mutiple of %d\n", -+ fprintf(stderr,"head file %s size %llu must be multiple of %d\n", - name_head, (long long)size, JOIN_FILE_ALIGN); - rc = -EINVAL; - goto out; -- Lustre Debian Packaging _______________________________________________ Pkg-lustre-svn-commit mailing list Pkg-lustre-svn-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-lustre-svn-commit