The following commit has been merged in the master branch:
commit 76c76332b3c7067219db3c61171bd1a01f6d2d79
Author: Patrick Winnertz <win...@debian.org>
Date:   Wed Mar 3 18:29:18 2010 +0100

    don't patch debian/* files
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/no-strict-aliasing.dpatch 
b/debian/patches/no-strict-aliasing.dpatch
index 1c16525..b4c56b9 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -1446,191 +1446,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  # include/liblustre.h
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/debian/patches/autogen-run.dpatch 
lustre/debian/patches/autogen-run.dpatch
---- lustre~/debian/patches/autogen-run.dpatch  2010-03-03 17:39:27.000000000 
+0100
-+++ lustre/debian/patches/autogen-run.dpatch   2010-03-03 18:06:42.712632577 
+0100
-@@ -7601,7 +7601,7 @@
- +{ echo "$as_me:$LINENO: checking kernel __u64 is long long type" >&5
- +echo $ECHO_N "checking kernel __u64 is long long type... $ECHO_C" >&6; }
-  tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror"
-+ EXTRA_KCFLAGS="$EXTRA_KCFLAGS -Werror -fno-strict-aliasing"
-  cat >conftest.c <<_ACEOF
- @@ -7702,8 +8513,8 @@ if { ac_try='cp conftest.c build && make -d modules 
${LD:+"LD=$LD"} CC="$CC" -f
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -7632,7 +7632,7 @@
- +{ echo "$as_me:$LINENO: checking ssize_t is signed long type" >&5
- +echo $ECHO_N "checking ssize_t is signed long type... $ECHO_C" >&6; }
-  tmp_flags="$CFLAGS"
-- CFLAGS="$CFLAGS -Werror"
-+ CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
-  cat >conftest.$ac_ext <<_ACEOF
- @@ -7740,30 +8551,25 @@ cat >conftest.$ac_ext <<_ACEOF
-  
-@@ -7698,7 +7698,7 @@
- +{ echo "$as_me:$LINENO: checking size_t is unsigned long type" >&5
- +echo $ECHO_N "checking size_t is unsigned long type... $ECHO_C" >&6; }
-  tmp_flags="$CFLAGS"
-- CFLAGS="$CFLAGS -Werror"
-+ CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
-  cat >conftest.$ac_ext <<_ACEOF
- @@ -7800,30 +8607,25 @@ cat >conftest.$ac_ext <<_ACEOF
-  
-@@ -7987,7 +7987,7 @@
- +{ echo "$as_me:$LINENO: checking check kernel has struct kmem_cache" >&5
- +echo $ECHO_N "checking check kernel has struct kmem_cache... $ECHO_C" >&6; }
-  tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="-Werror"
-+ EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
-  cat >conftest.c <<_ACEOF
- @@ -8259,8 +9062,8 @@ if { ac_try='cp conftest.c build && make -d modules 
${LD:+"LD=$LD"} CC="$CC" -f
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -8190,7 +8190,7 @@
- +echo "${ECHO_T}yes" >&6; }
-  
-       tmp_flags="$EXTRA_KCFLAGS"
--      EXTRA_KCFLAGS="-Werror"
-+      EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- -     echo "$as_me:$LINENO: checking whether we can really use dump_trace" >&5
- -echo $ECHO_N "checking whether we can really use dump_trace... $ECHO_C" >&6
- +     { echo "$as_me:$LINENO: checking whether we can really use dump_trace" 
>&5
-@@ -8259,7 +8259,7 @@
- +echo "${ECHO_T}yes" >&6; }
-  
-       tmp_flags="$EXTRA_KCFLAGS"
--      EXTRA_KCFLAGS="-Werror"
-+      EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
- -     echo "$as_me:$LINENO: checking whether we can really use dump_trace" >&5
- -echo $ECHO_N "checking whether we can really use dump_trace... $ECHO_C" >&6
- +     { echo "$as_me:$LINENO: checking whether we can really use dump_trace" 
>&5
-@@ -8392,7 +8392,7 @@
- +{ echo "$as_me:$LINENO: checking if kernel defines unshare_fs_struct()" >&5
- +echo $ECHO_N "checking if kernel defines unshare_fs_struct()... $ECHO_C" 
>&6; }
-  tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="-Werror"
-+ EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
-  cat >conftest.c <<_ACEOF
- @@ -8945,8 +9749,8 @@ if { ac_try='cp conftest.c build && make -d modules 
${LD:+"LD=$LD"} CC="$CC" -f
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -9941,7 +9941,7 @@
- +          { echo "$as_me:$LINENO: checking mapping->tree_lock is rw_lock" >&5
- +echo $ECHO_N "checking mapping->tree_lock is rw_lock... $ECHO_C" >&6; }
-  tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="-Werror"
-+ EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
-  cat >conftest.c <<_ACEOF
- @@ -11222,8 +12030,8 @@ if { ac_try='cp conftest.c build && make -d modules 
${LD:+"LD=$LD"} CC="$CC" -f
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -10286,7 +10286,7 @@
- +          { echo "$as_me:$LINENO: checking if umount_begin needs vfsmount 
parameter instead of super_block" >&5
- +echo $ECHO_N "checking if umount_begin needs vfsmount parameter instead of 
super_block... $ECHO_C" >&6; }
-  tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="-Werror"
-+ EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
-  cat >conftest.c <<_ACEOF
- @@ -11842,8 +12650,8 @@ if { ac_try='cp conftest.c build && make -d modules 
${LD:+"LD=$LD"} CC="$CC" -f
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -10611,7 +10611,7 @@
- +          { echo "$as_me:$LINENO: checking check vfs_readdir need 64bit 
inode number" >&5
- +echo $ECHO_N "checking check vfs_readdir need 64bit inode number... $ECHO_C" 
>&6; }
-  tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="-Werror"
-+ EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
-  cat >conftest.c <<_ACEOF
- @@ -12343,8 +13152,8 @@ if { ac_try='cp conftest.c build && make -d modules 
${LD:+"LD=$LD"} CC="$CC" -f
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -11029,7 +11029,7 @@
- +        { echo "$as_me:$LINENO: checking if kernel using gfp_t for shrinker 
second paramter" >&5
- +echo $ECHO_N "checking if kernel using gfp_t for shrinker second paramter... 
$ECHO_C" >&6; }
-          tmp_flags="$EXTRA_KCFLAGS"
--         EXTRA_KCFLAGS="-Werror"
-+         EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
-          cat >conftest.c <<_ACEOF
- @@ -13068,8 +13878,8 @@ if { ac_try='cp conftest.c build && make -d modules 
${LD:+"LD=$LD"} CC="$CC" -f
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -11424,7 +11424,7 @@
- +          { echo "$as_me:$LINENO: checking mapping->tree_lock is rw_lock" >&5
- +echo $ECHO_N "checking mapping->tree_lock is rw_lock... $ECHO_C" >&6; }
-  tmp_flags="$EXTRA_KCFLAGS"
-- EXTRA_KCFLAGS="-Werror"
-+ EXTRA_KCFLAGS="-Werror -fno-strict-aliasing"
-  cat >conftest.c <<_ACEOF
- @@ -13756,8 +14567,8 @@ if { ac_try='cp conftest.c build && make -d modules 
${LD:+"LD=$LD"} CC="$CC" -f
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-@@ -11989,7 +11989,7 @@
- +{ echo "$as_me:$LINENO: checking userspace __u64 is long long type" >&5
- +echo $ECHO_N "checking userspace __u64 is long long type... $ECHO_C" >&6; }
-  tmp_flags="$CFLAGS"
-- CFLAGS="$CFLAGS -Werror"
-+ CFLAGS="$CFLAGS -Werror -fno-strict-aliasing"
-  cat >conftest.$ac_ext <<_ACEOF
- @@ -14647,30 +15364,25 @@ cat >conftest.$ac_ext <<_ACEOF
-  
-@@ -29696,7 +29696,7 @@
-         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-        # icc doesn't choke on unknown options, it will just issue warnings
---      # or remarks (even with -Werror).  So we grep stderr for any message
-+-      # or remarks (even with -Werror -fno-strict-aliasing).  So we grep 
stderr for any message
- -      # that says an option was ignored or not supported.
- -      # When given -MP, icc 7.0 and 7.1 complain thusly:
- -      #   icc: Command line warning: ignoring option '-M'; no argument 
required
-@@ -29704,7 +29704,7 @@
- -      #   icc: Command line remark: option '-MP' not supported
- -      if (grep 'ignoring option' conftest.err ||
- -          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
--+      # (even with -Werror).  So we grep stderr for any message
-++      # (even with -Werror -fno-strict-aliasing).  So we grep stderr for any 
message
- +      # that says an option was ignored.
- +      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-          am_cv_$1_dependencies_compiler_type=$depmode
-@@ -33793,7 +33793,7 @@
-         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-        # icc doesn't choke on unknown options, it will just issue warnings
---      # or remarks (even with -Werror).  So we grep stderr for any message
-+-      # or remarks (even with -Werror -fno-strict-aliasing).  So we grep 
stderr for any message
- -      # that says an option was ignored or not supported.
- -      # When given -MP, icc 7.0 and 7.1 complain thusly:
- -      #   icc: Command line warning: ignoring option '-M'; no argument 
required
-@@ -33801,7 +33801,7 @@
- -      #   icc: Command line remark: option '-MP' not supported
- -      if (grep 'ignoring option' conftest.err ||
- -          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
--+      # (even with -Werror).  So we grep stderr for any message
-++      # (even with -Werror -fno-strict-aliasing).  So we grep stderr for any 
message
- +      # that says an option was ignored.
- +      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
-          am_cv_CC_dependencies_compiler_type=$depmode
-@@ -35526,7 +35526,7 @@
- +{ echo "$as_me:$LINENO: checking for POSIX 2008 preadv" >&5
- +echo $ECHO_N "checking for POSIX 2008 preadv... $ECHO_C" >&6; }
-  tmp_flags="$CFLAGS"
-- CFLAGS="$CFLAGS -Wall -Werror"
-+ CFLAGS="$CFLAGS -Wall -Werror -fno-strict-aliasing"
-  cat >conftest.$ac_ext <<_ACEOF
- @@ -4594,50 +5227,46 @@ main ()
-  }
-@@ -35596,7 +35596,7 @@
- +{ echo "$as_me:$LINENO: checking for POSIX 2008 scandir" >&5
- +echo $ECHO_N "checking for POSIX 2008 scandir... $ECHO_C" >&6; }
-  tmp_flags="$CFLAGS"
-- CFLAGS="$CFLAGS -Wall -Werror"
-+ CFLAGS="$CFLAGS -Wall -Werror -fno-strict-aliasing"
-  cat >conftest.$ac_ext <<_ACEOF
- @@ -4670,51 +5299,47 @@ main ()
-  }
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/debian/patches/fix_various_typecasts.dpatch 
lustre/debian/patches/fix_various_typecasts.dpatch
---- lustre~/debian/patches/fix_various_typecasts.dpatch        2010-03-03 
14:44:35.000000000 +0100
-+++ lustre/debian/patches/fix_various_typecasts.dpatch 2010-03-03 
18:06:42.716658368 +0100
-@@ -2,7 +2,7 @@
- ## autogen.dpatch by Patrick Winnertz <win...@debian.org>
- ##
- ## All lines beginning with `## DP:' are a description of the patch.
--## DP: as we compile now with -Werror add typecasts for the printf stuff in 
sanity.c
-+## DP: as we compile now with -Werror -fno-strict-aliasing add typecasts for 
the printf stuff in sanity.c
- 
- @DPATCH@
- diff -urNad lustre~/lustre/liblustre/tests/recovery_small.c 
lustre/lustre/liblustre/tests/recovery_small.c
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/ldiskfs/aclocal.m4 lustre/ldiskfs/aclocal.m4
 --- lustre~/ldiskfs/aclocal.m4 2010-03-03 18:02:06.039633980 +0100
 +++ lustre/ldiskfs/aclocal.m4  2010-03-03 18:06:42.724658338 +0100

-- 
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