[Debian-ha-svn-commits] [SCM] cluster suite Debian packaging branch, master, updated. debian/3.0.6-1

[Guido Günther]

The following commit has been merged in the master branch:
commit ff09490fc965eefacdd513bdb5404cb36aec1307
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Nov 25 22:28:05 2009 +0100

    redo patches

diff --git a/debian/patches/0001-add-dlm-kernel-headers.patch b/debian/patches/0001-add-dlm-kernel-headers.patch
index 6d7855d..e014f06 100644
--- a/debian/patches/0001-add-dlm-kernel-headers.patch
+++ b/debian/patches/0001-add-dlm-kernel-headers.patch
@@ -3,10 +3,10 @@ Date: Tue, 7 Jul 2009 13:08:43 +0200
 Subject: [PATCH] add dlm kernel headers
 
 ---
- dlm/include/linux/dlm.h          |  169 ++++++++++++++++++++++++++++++++++++++
- dlm/include/linux/dlm_device.h   |  112 +++++++++++++++++++++++++
+ dlm/include/linux/dlm.h          |  168 ++++++++++++++++++++++++++++++++++++++
+ dlm/include/linux/dlm_device.h   |  111 +++++++++++++++++++++++++
  dlm/include/linux/dlm_netlink.h  |   56 +++++++++++++
- dlm/include/linux/dlm_plock.h    |   50 +++++++++++
+ dlm/include/linux/dlm_plock.h    |   49 +++++++++++
  dlm/include/linux/dlmconstants.h |  163 ++++++++++++++++++++++++++++++++++++
  dlm/libdlm/Makefile              |    2 +-
  dlm/libdlmcontrol/Makefile       |    1 +
@@ -14,7 +14,7 @@ Subject: [PATCH] add dlm kernel headers
  group/dlm_controld/Makefile      |    1 +
  group/gfs_controld/Makefile      |    1 +
  group/tool/Makefile              |    1 +
- 11 files changed, 556 insertions(+), 1 deletions(-)
+ 11 files changed, 553 insertions(+), 1 deletions(-)
  create mode 100644 dlm/include/linux/dlm.h
  create mode 100644 dlm/include/linux/dlm_device.h
  create mode 100644 dlm/include/linux/dlm_netlink.h
@@ -23,10 +23,10 @@ Subject: [PATCH] add dlm kernel headers
 
 diff --git a/dlm/include/linux/dlm.h b/dlm/include/linux/dlm.h
 new file mode 100644
-index 0000000..203a025
+index 0000000..fbdfe89
 --- /dev/null
 +++ b/dlm/include/linux/dlm.h
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,168 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -195,13 +195,12 @@ index 0000000..203a025
 +#endif				/* __KERNEL__ */
 +
 +#endif				/* __DLM_DOT_H__ */
-+
 diff --git a/dlm/include/linux/dlm_device.h b/dlm/include/linux/dlm_device.h
 new file mode 100644
-index 0000000..4361244
+index 0000000..7754932
 --- /dev/null
 +++ b/dlm/include/linux/dlm_device.h
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,111 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -313,7 +312,6 @@ index 0000000..4361244
 +#define DLM_USER_LSFLG_FORCEFREE  2
 +
 +#endif
-+
 diff --git a/dlm/include/linux/dlm_netlink.h b/dlm/include/linux/dlm_netlink.h
 new file mode 100644
 index 0000000..1927633
@@ -378,10 +376,10 @@ index 0000000..1927633
 +#endif /* _DLM_NETLINK_H */
 diff --git a/dlm/include/linux/dlm_plock.h b/dlm/include/linux/dlm_plock.h
 new file mode 100644
-index 0000000..18d5fdb
+index 0000000..f2eff75
 --- /dev/null
 +++ b/dlm/include/linux/dlm_plock.h
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,49 @@
 +/*
 + * Copyright (C) 2005-2008 Red Hat, Inc.  All rights reserved.
 + *
@@ -431,7 +429,6 @@ index 0000000..18d5fdb
 +#endif /* __KERNEL__ */
 +
 +#endif
-+
 diff --git a/dlm/include/linux/dlmconstants.h b/dlm/include/linux/dlmconstants.h
 new file mode 100644
 index 0000000..47bf08d

-- 
cluster suite Debian packaging