The following commit has been merged in the master branch:
commit 4d5e398b65608c2f093d34de0b956a1e60480bb4
Author: Patrick Winnertz <win...@debian.org>
Date:   Fri Dec 10 13:39:27 2010 +0100

    some more lintian warnings
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/control b/debian/control
index 156b4a1..5583885 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Lustre Packaging team 
<pkg-lustre-maintain...@lists.alioth.debian.org>
 Uploaders: Patrick Winnertz <win...@debian.org>, Noèl Köthe <n...@debian.org>
 Standards-Version: 3.8.4
-Build-Depends: libreadline-dev, debhelper (>=6.0.7), dh-kpatches (>= 0.99.3), 
lyx, automake1.7, libsnmp-dev, bzip2, texlive-extra-utils | tetex-extra, quilt, 
texlive-latex-recommended
+Build-Depends: libreadline-dev, debhelper (>=6.0.7), dh-kpatches (>= 0.99.3), 
lyx, automake1.7, libsnmp-dev, bzip2, texlive-extra-utils, quilt, 
texlive-latex-recommended
 Homepage: http://www.lustre.org/
 Vcs-Cvs: -d :pserver:anonym...@cvs.lustre.org:/lustre
 
diff --git a/debian/lustre-tests.lintian-overrides 
b/debian/lustre-tests.lintian-overrides
index 0fcd81f..4d275c6 100644
--- a/debian/lustre-tests.lintian-overrides
+++ b/debian/lustre-tests.lintian-overrides
@@ -1,2 +1,3 @@
 #This are only config files, not executables
 lustre-tests: executable-not-elf-or-script ./usr/lib/lustre/tests/cfg/local.sh
+lustre-tests: executable-not-elf-or-script 
./usr/lib/lustre/tests/mdsrate-create-small.sh
diff --git a/debian/patches/series b/debian/patches/series
index ba9b7b8..9fc9cb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,3 +21,4 @@ fix-oot-builds.patch
 no-strict-aliasing.patch
 fix_bashisms_for_dash.patch
 fix_dentry_conf_test.patch
+spelling_errors.patch
diff --git a/debian/patches/spelling_errors.patch 
b/debian/patches/spelling_errors.patch
new file mode 100644
index 0000000..5555947
--- /dev/null
+++ b/debian/patches/spelling_errors.patch
@@ -0,0 +1,28 @@
+#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;
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
deleted file mode 100644
index af59b2d..0000000
--- a/debian/source.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-lustre source: ored-build-depends-on-obsolete-package build-depends: 
tetex-extra

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to