The following commit has been merged in the master branch:
commit dad58273af91d455976caeff4899c34fb92c2641
Author: Patrick Winnertz <win...@debian.org>
Date:   Tue Aug 11 14:13:11 2009 +0200

    Rediffed no-darwin patch against 1.8.1
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/no-darwin.dpatch b/debian/patches/no-darwin.dpatch
index 433bf7b..7003153 100755
--- a/debian/patches/no-darwin.dpatch
+++ b/debian/patches/no-darwin.dpatch
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad lustre~/autoMakefile.am lustre/autoMakefile.am
---- lustre~/autoMakefile.am    2009-06-02 11:36:21.000000000 +0200
-+++ lustre/autoMakefile.am     2009-06-02 11:36:40.000000000 +0200
+--- lustre~/autoMakefile.am    2009-08-11 12:37:07.000000000 +0200
++++ lustre/autoMakefile.am     2009-08-11 14:09:04.000000000 +0200
 @@ -3,7 +3,7 @@
  SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
  RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
@@ -19,8 +19,8 @@ diff -urNad lustre~/autoMakefile.am lustre/autoMakefile.am
  
  include build/autoMakefile.am.toplevel
 diff -urNad lustre~/lnet/include/libcfs/Makefile.am 
lustre/lnet/include/libcfs/Makefile.am
---- lustre~/lnet/include/libcfs/Makefile.am    2009-06-02 11:36:21.000000000 
+0200
-+++ lustre/lnet/include/libcfs/Makefile.am     2009-06-02 11:36:40.000000000 
+0200
+--- lustre~/lnet/include/libcfs/Makefile.am    2007-11-29 15:13:28.000000000 
+0100
++++ lustre/lnet/include/libcfs/Makefile.am     2009-08-11 14:09:04.000000000 
+0200
 @@ -1,7 +1,7 @@
  SUBDIRS := linux
 -if DARWIN
@@ -33,8 +33,8 @@ diff -urNad lustre~/lnet/include/libcfs/Makefile.am 
lustre/lnet/include/libcfs/M
  
  EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
 diff -urNad lustre~/lnet/include/lnet/Makefile.am 
lustre/lnet/include/lnet/Makefile.am
---- lustre~/lnet/include/lnet/Makefile.am      2009-06-02 11:36:21.000000000 
+0200
-+++ lustre/lnet/include/lnet/Makefile.am       2009-06-02 11:36:40.000000000 
+0200
+--- lustre~/lnet/include/lnet/Makefile.am      2008-11-20 16:14:28.000000000 
+0100
++++ lustre/lnet/include/lnet/Makefile.am       2009-08-11 14:09:04.000000000 
+0200
 @@ -1,9 +1,9 @@
  lnetdir=$(includedir)/lnet
  
@@ -49,18 +49,17 @@ diff -urNad lustre~/lnet/include/lnet/Makefile.am 
lustre/lnet/include/lnet/Makef
  
  EXTRA_DIST = api.h api-support.h \
 diff -urNad lustre~/lnet/klnds/socklnd/autoMakefile.am 
lustre/lnet/klnds/socklnd/autoMakefile.am
---- lustre~/lnet/klnds/socklnd/autoMakefile.am 2009-06-02 11:36:21.000000000 
+0200
-+++ lustre/lnet/klnds/socklnd/autoMakefile.am  2009-06-02 11:36:40.000000000 
+0200
-@@ -8,23 +8,23 @@
- 
- DIST_SOURCES := $(ksocklnd-objs:%.o=%.c) socklnd_lib-linux.h socklnd.h
+--- lustre~/lnet/klnds/socklnd/autoMakefile.am 2009-08-11 12:37:07.000000000 
+0200
++++ lustre/lnet/klnds/socklnd/autoMakefile.am  2009-08-11 14:11:04.000000000 
+0200
+@@ -6,21 +6,21 @@
+ endif # LINUX
+ endif # MODULES
  
 -if DARWIN
 -
 -  macos_PROGRAMS := ksocklnd
 -
--  nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_modparams.c 
socklnd_lib-darwin.c
--  DIST_SOURCES += socklnd_lib-darwin.c socklnd_lib-darwin.h
+-  nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c 
socklnd_modparams.c socklnd_lib-darwin.c
 -
 -  ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
 -  ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
@@ -68,14 +67,11 @@ diff -urNad lustre~/lnet/klnds/socklnd/autoMakefile.am 
lustre/lnet/klnds/socklnd
 -
 -  plist_DATA := Info.plist
 -  install_data_hook := fix-kext-ownership
--
--endif # DARWIN
 +#if DARWIN
 +#
 +#  macos_PROGRAMS := ksocklnd
 +#
-+#  nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_modparams.c 
socklnd_lib-darwin.c
-+#  DIST_SOURCES += socklnd_lib-darwin.c socklnd_lib-darwin.h
++#  nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c 
socklnd_modparams.c socklnd_lib-darwin.c
 +#
 +#  ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
 +#  ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
@@ -83,17 +79,17 @@ diff -urNad lustre~/lnet/klnds/socklnd/autoMakefile.am 
lustre/lnet/klnds/socklnd
 +#
 +#  plist_DATA := Info.plist
 +#  install_data_hook := fix-kext-ownership
-+#
-+#  EXTRA_DIST := $(plist_DATA)
+ 
+-  EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
+-endif # DARWIN
++#  EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
 +#endif # DARWIN
  
--EXTRA_DIST := $(plist_DATA)
  install-data-hook: $(install_data_hook)
  
- MOSTLYCLEANFILES = @MOSTLYCLEANFILES@ socklnd_lib.c
 diff -urNad lustre~/lnet/libcfs/autoMakefile.am 
lustre/lnet/libcfs/autoMakefile.am
---- lustre~/lnet/libcfs/autoMakefile.am        2009-06-02 11:36:21.000000000 
+0200
-+++ lustre/lnet/libcfs/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200
+--- lustre~/lnet/libcfs/autoMakefile.am        2009-08-11 12:37:07.000000000 
+0200
++++ lustre/lnet/libcfs/autoMakefile.am 2009-08-11 14:09:04.000000000 +0200
 @@ -35,9 +35,9 @@
  #
  
@@ -153,8 +149,8 @@ diff -urNad lustre~/lnet/libcfs/autoMakefile.am 
lustre/lnet/libcfs/autoMakefile.
  endif
  
 diff -urNad lustre~/lnet/lnet/autoMakefile.am lustre/lnet/lnet/autoMakefile.am
---- lustre~/lnet/lnet/autoMakefile.am  2009-06-02 11:36:21.000000000 +0200
-+++ lustre/lnet/lnet/autoMakefile.am   2009-06-02 11:36:40.000000000 +0200
+--- lustre~/lnet/lnet/autoMakefile.am  2009-08-11 12:37:07.000000000 +0200
++++ lustre/lnet/lnet/autoMakefile.am   2009-08-11 14:09:04.000000000 +0200
 @@ -18,23 +18,23 @@
  modulenet_DATA = lnet$(KMODEXT)
  endif # LINUX
@@ -197,8 +193,8 @@ diff -urNad lustre~/lnet/lnet/autoMakefile.am 
lustre/lnet/lnet/autoMakefile.am
  endif # MODULES
  
 diff -urNad lustre~/lustre/lov/autoMakefile.am 
lustre/lustre/lov/autoMakefile.am
---- lustre~/lustre/lov/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200
-+++ lustre/lustre/lov/autoMakefile.am  2009-06-02 11:37:25.000000000 +0200
+--- lustre~/lustre/lov/autoMakefile.am 2009-08-11 12:37:07.000000000 +0200
++++ lustre/lustre/lov/autoMakefile.am  2009-08-11 14:09:04.000000000 +0200
 @@ -46,29 +46,29 @@
  modulefs_DATA = lov$(KMODEXT)
  endif
@@ -249,7 +245,7 @@ diff -urNad lustre~/lustre/lov/autoMakefile.am 
lustre/lustre/lov/autoMakefile.am
  
 diff -urNad lustre~/lustre/lov/autoMakefile.am~ 
lustre/lustre/lov/autoMakefile.am~
 --- lustre~/lustre/lov/autoMakefile.am~        1970-01-01 01:00:00.000000000 
+0100
-+++ lustre/lustre/lov/autoMakefile.am~ 2009-06-02 11:36:40.000000000 +0200
++++ lustre/lustre/lov/autoMakefile.am~ 2009-08-11 14:09:04.000000000 +0200
 @@ -0,0 +1,78 @@
 +#
 +# GPL HEADER START
@@ -330,9 +326,9 @@ diff -urNad lustre~/lustre/lov/autoMakefile.am~ 
lustre/lustre/lov/autoMakefile.a
 +DIST_SOURCES = $(lov-objs:.o=.c) lov_internal.h
 +MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ 
 diff -urNad lustre~/lustre/lvfs/autoMakefile.am 
lustre/lustre/lvfs/autoMakefile.am
---- lustre~/lustre/lvfs/autoMakefile.am        2009-06-02 11:36:21.000000000 
+0200
-+++ lustre/lustre/lvfs/autoMakefile.am 2009-06-02 11:36:40.000000000 +0200
-@@ -80,21 +80,21 @@
+--- lustre~/lustre/lvfs/autoMakefile.am        2009-08-11 12:37:07.000000000 
+0200
++++ lustre/lustre/lvfs/autoMakefile.am 2009-08-11 14:09:04.000000000 +0200
+@@ -85,21 +85,21 @@
  
  endif # LINUX
  
@@ -370,8 +366,8 @@ diff -urNad lustre~/lustre/lvfs/autoMakefile.am 
lustre/lustre/lvfs/autoMakefile.
  else # MODULES
  
 diff -urNad lustre~/lustre/obdclass/autoMakefile.am 
lustre/lustre/obdclass/autoMakefile.am
---- lustre~/lustre/obdclass/autoMakefile.am    2009-06-02 11:36:21.000000000 
+0200
-+++ lustre/lustre/obdclass/autoMakefile.am     2009-06-02 11:36:40.000000000 
+0200
+--- lustre~/lustre/obdclass/autoMakefile.am    2009-08-11 12:37:07.000000000 
+0200
++++ lustre/lustre/obdclass/autoMakefile.am     2009-08-11 14:09:04.000000000 
+0200
 @@ -1,7 +1,7 @@
  SUBDIRS := linux
 -if DARWIN
@@ -429,8 +425,8 @@ diff -urNad lustre~/lustre/obdclass/autoMakefile.am 
lustre/lustre/obdclass/autoM
  endif # MODULES
  
 diff -urNad lustre~/lustre/obdecho/autoMakefile.am 
lustre/lustre/obdecho/autoMakefile.am
---- lustre~/lustre/obdecho/autoMakefile.am     2009-06-02 11:36:21.000000000 
+0200
-+++ lustre/lustre/obdecho/autoMakefile.am      2009-06-02 11:36:40.000000000 
+0200
+--- lustre~/lustre/obdecho/autoMakefile.am     2009-08-11 12:37:07.000000000 
+0200
++++ lustre/lustre/obdecho/autoMakefile.am      2009-08-11 14:09:04.000000000 
+0200
 @@ -46,22 +46,22 @@
  modulefs_DATA = obdecho$(KMODEXT)
  endif
@@ -471,8 +467,8 @@ diff -urNad lustre~/lustre/obdecho/autoMakefile.am 
lustre/lustre/obdecho/autoMak
  endif # MODULES
  
 diff -urNad lustre~/lustre/osc/autoMakefile.am 
lustre/lustre/osc/autoMakefile.am
---- lustre~/lustre/osc/autoMakefile.am 2009-06-02 11:36:21.000000000 +0200
-+++ lustre/lustre/osc/autoMakefile.am  2009-06-02 11:36:40.000000000 +0200
+--- lustre~/lustre/osc/autoMakefile.am 2009-08-11 12:37:07.000000000 +0200
++++ lustre/lustre/osc/autoMakefile.am  2009-08-11 14:09:04.000000000 +0200
 @@ -47,22 +47,22 @@
  modulefs_DATA = osc$(KMODEXT)
  endif
@@ -513,8 +509,8 @@ diff -urNad lustre~/lustre/osc/autoMakefile.am 
lustre/lustre/osc/autoMakefile.am
  endif
  
 diff -urNad lustre~/lustre/ptlrpc/autoMakefile.am 
lustre/lustre/ptlrpc/autoMakefile.am
---- lustre~/lustre/ptlrpc/autoMakefile.am      2009-06-02 11:36:21.000000000 
+0200
-+++ lustre/lustre/ptlrpc/autoMakefile.am       2009-06-02 11:36:40.000000000 
+0200
+--- lustre~/lustre/ptlrpc/autoMakefile.am      2009-08-11 12:37:07.000000000 
+0200
++++ lustre/lustre/ptlrpc/autoMakefile.am       2009-08-11 14:09:04.000000000 
+0200
 @@ -68,39 +68,39 @@
  modulefs_DATA = ptlrpc$(KMODEXT)
  endif #LINUX

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