[Pkg-lustre-svn-commit] created: [529916c] Imported Upstream version 2.2.0

[Patrick Winnertz]

The annotated tag, upstream/2.2.0 has been created
at  66705debbdeaa36397286b562a6ed9b7b9fe3f36 (tag)
   tagging  529916cc95040aaae0b2dcacbd4e987d10768875 (commit)
  replaces  upstream/1.8.7-wc1+dfsg
 tagged by  Marco Nelles
on  Mon Aug 20 12:03:59 2012 +0200

- Shortlog 
Upstream version 2.2.0

Patrick Winnertz (1):
  Imported Upstream version 2.2.0

---

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

[Pkg-lustre-svn-commit] updated: [16ca4b3] Add fix-oot-build.patch again and modified it a bit

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 16ca4b3a04d61af79097913c87e14ef2859a4178
Author: Patrick Winnertz win...@debian.org
Date:   Wed May 30 14:22:01 2012 +0200

Add fix-oot-build.patch again and modified it a bit

 Signed-off-by: Patrick Winnertz win...@debian.org

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/fix-oot-builds.patch 
b/debian/patches/fix-oot-builds.patch
index e9e18cc..34a5efa 100644
--- a/debian/patches/fix-oot-builds.patch
+++ b/debian/patches/fix-oot-builds.patch
@@ -101,12 +101,3 @@ Index: lustre/lustre/scripts/version_tag.pl
  if ($am_linuxdir ne );
 Index: lustre/META
 ===
 /dev/null  1970-01-01 00:00:00.0 +
-+++ lustre/META2011-12-02 13:57:06.573963089 +0100
-@@ -0,0 +1,6 @@
-+TAG = v1_8_7_WC1
-+VERSION = 1.8.7
-+BUILDID = 
-+PRISTINE = 0
-+LOCAL_VERSION =
-+ 
diff --git a/debian/patches/series b/debian/patches/series
index bcc3b28..b6bb5b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,7 @@ tex2pdf.patch
 #enable-quota.patch
 #fix-symlink-attack.patch
 use_bash_instead_of_sh.patch
-#fix-oot-builds.patch
+fix-oot-builds.patch
 #no-strict-aliasing.patch
 #fix_bashisms_for_dash.patch
 #fix_dentry_conf_test.patch

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

[Pkg-lustre-svn-commit] updated: [2a3aa2f] use no-darwin.patch again for 2.2

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 2a3aa2f36f48b27591b2962372edbc81f638f7a0
Author: Patrick Winnertz win...@debian.org
Date:   Wed May 30 14:50:47 2012 +0200

use no-darwin.patch again for 2.2

 Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/series b/debian/patches/series
index b6bb5b7..1dff3ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 #posix_acl.patch
 #ldiskfs-detect-2.6.20-2.6.22.patch
 #no_default_debugging.patch
-#no-darwin.patch
+no-darwin.patch
 #libsysio.patch
 #bug12769-ql-fix.patch
 #bug15587_security.capability_xattr.patch

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

[Pkg-lustre-svn-commit] updated: [bc4af80] Temp commit for build on squeeze

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit bc4af8026646e5989b5230f7e81b9272713123a7
Author: Patrick Winnertz win...@debian.org
Date:   Thu Feb 2 14:55:43 2012 +0100

Temp commit for build on squeeze

 Signed-off-by: Patrick Winnertz win...@debian.org

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 7ffda92..59df668 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lustre (1.8.7-wc1+dfsg-1) unstable; urgency=low
+lustre (1.8.7-wc1+dfsg-0.credativ.squeeze.1) unstable; urgency=low
 
   * [a7396a3] Imported Upstream version 1.8.7-wc1+dfsg
   * [50cd7c2] Remove autogen.sh patch as autogen.sh is provided by source

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

[Pkg-lustre-svn-commit] updated: [e8c20d8] test commit to see if this small commit fixes the problem

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit e8c20d8edb9ef82cc05a0eb0a490ec1fa7cacd48
Author: Patrick Winnertz win...@debian.org
Date:   Fri Sep 24 13:18:03 2010 +0200

test commit to see if this small commit fixes the problem

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 234fbdd..4d9914e 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -458,7 +458,7 @@ typedef struct ext2_struct_inode_scan *ext2_inode_scan;
 /*
  * ext2 size of an inode
  */
-#define EXT2_I_SIZE(i) ((i)-i_size | ((__u64) (i)-i_size_high  32))
+#define EXT2_I_SIZE(i) ((i).i_size | ((__u64) (i).i_size_high  32))
 
 /*
  * ext2_icount_t abstraction

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [4e7920e] temp commit

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 4e7920ec52eb3397c20a429e81214230914bcdbd
Author: Patrick Winnertz win...@debian.org
Date:   Fri Mar 9 12:34:16 2012 +0100

temp commit

 Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/asm_types.h b/asm_types.h
deleted file mode 100644
index 322a79f..000
--- a/asm_types.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#define __S8_TYPEDEF __signed__ char
-#define __U8_TYPEDEF unsigned char
-#define __S16_TYPEDEF __signed__ short
-#define __U16_TYPEDEF unsigned short
-#define __S32_TYPEDEF __signed__ int
-#define __U32_TYPEDEF unsigned int
-#define __S64_TYPEDEF __signed__ long long
-#define __U64_TYPEDEF unsigned long long
diff --git a/public_config.h b/public_config.h
deleted file mode 100644
index 044b0d7..000
--- a/public_config.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* These defines are needed for the public ext2fs.h header file */
-#define HAVE_SYS_TYPES_H 1
-#undef WORDS_BIGENDIAN

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [0082867] Added changelog entry for new ldiskfsck version

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 00828670a607e4428b61e7c16785961afd57cf34
Author: Patrick Winnertz win...@debian.org
Date:   Fri Mar 16 10:54:50 2012 +0100

Added changelog entry for new ldiskfsck version

 Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 72d1238..81b3ef4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ldiskfsprogs (1.41.90.wc4-1~1.gbp4e7920) UNRELEASED; urgency=low
+
+  ** SNAPSHOT build @4e7920ec52eb3397c20a429e81214230914bcdbd **
+
+  * bugzilla 21704 - lfsck doesn't work on pools
+  * test commit to see if this small commit fixes the problem
+  * Imported Upstream version 1.41.90.wc4
+  * Removed somed .orig files and don't fail when the patches and series file 
is not around
+  * temp commit
+
+ -- Patrick Winnertz win...@debian.org  Fri, 16 Mar 2012 10:54:36 +0100
+
 ldiskfsprogs (1.41.10-2) unstable; urgency=low
 
   * Build-depend on libdb-dev (= 4.7) instead of libdb4.6-dev (Closes:

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [a0fe8eb] bugzilla 21704 - lfsck doesn't work on pools

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit a0fe8ebc7aaacb69117679403c9424cdea07520b
Author: Patrick Winnertz win...@debian.org
Date:   Fri Sep 24 11:00:33 2010 +0200

bugzilla 21704 - lfsck doesn't work on pools

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/bug21704_mds_on_pools.patch 
b/debian/patches/bug21704_mds_on_pools.patch
new file mode 100644
index 000..b361bc2
--- /dev/null
+++ b/debian/patches/bug21704_mds_on_pools.patch
@@ -0,0 +1,287 @@
+diff -u e2fsprogs-1.41.12/e2fsck/lfsck.c e2fsprogs-1.41.12/e2fsck/lfsck.c
+--- e2fsprogs-1.41.12/e2fsck/lfsck.c
 e2fsprogs-1.41.12/e2fsck/lfsck.c
+@@ -922,7 +922,7 @@
+   }
+   lum-lmm_magic = LOV_USER_MAGIC;
+   lum-lmm_pattern = LOV_PATTERN_RAID0;
+-  lum-lmm_stripe_size = 65536;
++  lum-lmm_stripe_size = 1048576;
+   lum-lmm_stripe_offset = 0;
+   lum-lmm_stripe_count = 1;
+   lum-lmm_objects[0].l_object_id = ost_objid;
+@@ -1285,10 +1285,11 @@
+   return(rc);
+ }
+ 
+-int lfsck_validate_duplicate(__u64 mds_fid, const char *path,
+-   __u32 ost_idx, __u64 ost_objid,
+-   struct lov_user_md *lum)
++static int lfsck_validate_duplicate(__u64 mds_fid, const char *path,
++  __u32 ost_idx, __u64 ost_objid)
+ {
++  struct lov_user_md *lum;
++  struct lov_user_ost_data_v1 *loi;
+   struct stat64 st;
+   int rc, i;
+ 
+@@ -1309,33 +1310,55 @@
+   return -EBADF;
+   }
+ 
++  lum = malloc(LOV_EA_MAX(lum));
++  if (lum == NULL) {
++  log_write(%s: out of memory allocating LOV EA (%u)\n,
++progname, LOV_EA_MAX(lum));
++  return -ENOMEM;
++  }
++
+   rc = llapi_file_get_stripe(path, lum);
+   if (rc  0) {
+   log_write(%s: unable to get LOV EA on %s: %s\n,
+ progname, path, strerror(-rc));
+-  return rc;
++  goto out;
+   }
+ 
+   if (lum-lmm_pattern != LOV_PATTERN_RAID0) {
+   log_write(%s: unknown LOV stripe pattern %#08x\n,
+ progname, lum-lmm_pattern);
+-  return -EINVAL;
++  rc = -EINVAL;
++  goto out;
++  }
++
++  if (lum-lmm_magic == LOV_USER_MAGIC_V1) {
++  loi = lum-lmm_objects;
++  } else if (lum-lmm_magic == LOV_USER_MAGIC_V3) {
++  loi = ((struct lov_user_md_v3 *)lum)-lmm_objects;
++  } else {
++  log_write(%s: unknown LOV magic %#08x\n,
++progname, lum-lmm_magic);
++  rc = -EINVAL;
++  goto out;
+   }
+ 
+   /* Verify that the object in question is still in the file */
+-  for (i = 0; i  lum-lmm_stripe_count; i++){
+-  if (lum-lmm_objects[i].l_ost_idx == ost_idx 
+-  lum-lmm_objects[i].l_object_id == ost_objid)
++  for (i = 0; i  lum-lmm_stripe_count; i++, loi++) {
++  if (loi-l_ost_idx == ost_idx 
++  loi-l_object_id == ost_objid)
+   break;
+   }
+ 
+   if (i == lum-lmm_stripe_count) {
+   log_write(%s: couldn't find object %u:LPU64 in\n
+ \t%s\n, progname, ost_idx, ost_objid, path);
+-  return -EBADF;
++  rc = -EBADF;
++  goto out;
+   }
+ 
+-  return 0;
++out:
++  free(lum);
++  return rc;
+ }
+ 
+ #ifndef HAVE_LLAPI_CANCEL_OSC_LOCKS
+@@ -1387,7 +1410,6 @@
+ int lfsck_fix_duplicate(__u64 mds_fid, __u32 mds_generation,
+   __u32 ost_idx, __u64 ost_objid, DB *mds_direntdb)
+ {
+-  struct lov_user_md *lum;
+   char path_tmp[PATH_MAX] = { 0 }, path[PATH_MAX] = { 0 };
+   char tmp[PATH_MAX * 2 + 10] = { 0 };
+   const char *base;
+@@ -1410,14 +1432,7 @@
+   return 0;
+   }
+ 
+-  lum = malloc(LOV_EA_MAX(lum));
+-  if (lum == NULL) {
+-  log_write(%s: out of memory allocating LOV EA (%u)\n,
+-progname, LOV_EA_MAX(lum));
+-  return -ENOMEM;
+-  }
+-
+-  rc = lfsck_validate_duplicate(mds_fid, path, ost_idx, ost_objid, lum);
++  rc = lfsck_validate_duplicate(mds_fid, path, ost_idx, ost_objid);
+   if (rc  0)
+   goto out;
+ 
+@@ -1466,7 +1481,6 @@
+ out:
+   VERBOSE(2, unlink %s\n, path_tmp);
+   unlink(path_tmp);
+-  free(lum);
+ 
+   return rc;
+ }
+diff -u e2fsprogs-1.41.12/e2fsck/lfsck.h e2fsprogs-1.41.12/e2fsck/lfsck.h
+--- e2fsprogs-1.41.12/e2fsck/lfsck.h
 e2fsprogs-1.41.12/e2fsck/lfsck.h
+@@ -66,8 +66,7 @@
+ 
+ #define LOV_MAX_OSTS 2048   /* XXX - Not permanent, change */
+ #define LOV_EA_SIZE(lum, num) (sizeof(*lum) + num * sizeof(*lum-lmm_objects))
+-#define LOV_MAX_STRIPE_COUNT160
+-#define LOV_EA_MAX(lum) LOV_EA_SIZE(lum, LOV_MAX_STRIPE_COUNT)
++#define LOV_EA_MAX(lum) LOV_EA_SIZE(lum

[Pkg-lustre-svn-commit] updated: [90438f5] Patches for ldiskfsck are now preapplied

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 90438f5f2acc2fb7e0a83ade4b4750036e0bad5d
Author: Patrick Winnertz win...@debian.org
Date:   Fri Mar 16 11:09:09 2012 +0100

Patches for ldiskfsck are now preapplied

 Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/series b/debian/patches/series
index 21fb004..16d99f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,34 +1,2 @@
-e2fsprogs-version.patch 
-e2fsprogs-e2fsck_D.patch
-e2fsprogs-misc.patch
-e2fsprogs-e2fsck_exclusive.patch
-e2fsprogs-bad-ininode-ea.patch 
-e2fsprogs-blkid-zfs.patch
-e2fsprogs-fiemap-lustre.patch
-e2fsprogs-count_wrong_valid.patch
-e2fsprogs-specdotin.patch
-e2fsprogs-extended_ops.patch
-e2fsprogs-extents.patch 
-e2fsprogs-skip-extent-tests.patch
-e2fsprogs-config-before-cmdline.patch
-e2fsprogs-new-opt-shrdblks.patch 
-sles/e2fsprogs-SLES10--m-support.patch
-sles/libcom_err-no-static-buffer.patch
-sles/libcom_err-no-init_error_table.patch
-e2fsprogs-uninit-fixes.patch 
-e2fsprogs-expand-extra-isize.patch
-e2fsprogs-tests-f_expisize.patch
-e2fsprogs-ibadness-counter.patch 
-e2fsprogs-tests-f_random_corruption.patch
-e2fsprogs-mmp.patch
-e2fsprogs-tests-f_mmp.patch
-e2fsprogs-i_size-corruption.patch
-e2fsprogs-disp-extent_header.patch
-e2fsprogs-lustre_ismounted.patch
-e2fsprogs-lfsck.patch
-e2fsprogs-lfsck-absolute-path.patch
-e2fsprogs-add-io_channel_readahead.patch
-e2fsprogs-e2scan.patch 
-e2fsprogs-fid_in_dirent.patch
 static-linking.patch
 bug21704_mds_on_pools.patch

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [2bde0b7] Merge tag 'upstream/1.41.90.wc4'

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 2bde0b719f8a0aa69560c67594ff4432832f0184
Merge: e8c20d8edb9ef82cc05a0eb0a490ec1fa7cacd48 
b16e72ae6a1c0941dbaa18e1381a68f6c6efd913
Author: Patrick Winnertz win...@debian.org
Date:   Fri Mar 9 12:30:35 2012 +0100

Merge tag 'upstream/1.41.90.wc4'

Upstream version 1.41.90.wc4

diff --combined lib/ext2fs/ext2fs.h
index 4d9914e,6a422fe..7416745
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@@ -4,8 -4,8 +4,8 @@@
   * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
   *
   * %Begin-Header%
-  * This file may be redistributed under the terms of the GNU Public
-  * License.
+  * This file may be redistributed under the terms of the GNU Library
+  * General Public License, version 2.
   * %End-Header%
   */
  
@@@ -28,6 -28,10 +28,10 @@@ extern C 
  #if (!defined(__GNUC__)  !defined(__WATCOMC__))
  #define NO_INLINE_FUNCS
  #endif
+  
+ #ifndef _XOPEN_SOURCE
+ #define _XOPEN_SOURCE 600 /* for posix_memalign() */
+ #endif
  
  /*
   * Where the master copy of the superblock is located, and how big
@@@ -52,6 -56,7 +56,7 @@@
  #include stdio.h
  #include stdlib.h
  #include string.h
+ #include errno.h
  
  #if EXT2_FLAT_INCLUDES
  #include e2_types.h
@@@ -68,6 -73,7 +73,7 @@@ typedef __u32 blk_t
  typedef __u64 blk64_t;
  typedef __u32 dgrp_t;
  typedef __u32 ext2_off_t;
+ typedef __u64 ext2_off64_t;
  typedef __s64 e2_blkcnt_t;
  typedef __u32 ext2_dirhash_t;
  
@@@ -124,6 -130,13 +130,13 @@@ typedef struct ext2_struct_u32_iterate 
  /*
   * ext2_dblist structure and abstractions (see dblist.c)
   */
+ struct ext2_db_entry2 {
+   ext2_ino_t  ino;
+   blk64_t blk;
+   e2_blkcnt_t blockcnt;
+ };
+ 
+ /* Ye Olde 32-bit version */
  struct ext2_db_entry {
ext2_ino_t  ino;
blk_t   blk;
@@@ -172,6 -185,10 +185,10 @@@ typedef struct ext2_file *ext2_file_t
  #define EXT2_FLAG_EXCLUSIVE   0x4000
  #define EXT2_FLAG_SOFTSUPP_FEATURES   0x8000
  #define EXT2_FLAG_NOFREE_ON_ERROR 0x1
+ #define EXT2_FLAG_64BITS  0x2
+ #define EXT2_FLAG_PRINT_PROGRESS  0x4
+ #define EXT2_FLAG_DIRECT_IO   0x8
+ #define EXT2_FLAG_SKIP_MMP0x10
  
  /*
   * Special flag in the ext2 inode i_flag field that means that this is
@@@ -181,10 -198,20 +198,20 @@@
  
  /*
   * Flags for mkjournal
-  *
-  * EXT2_MKJOURNAL_V1_SUPERMake a (deprecated) V1 journal superblock
   */
- #define EXT2_MKJOURNAL_V1_SUPER   0x001
+ #define EXT2_MKJOURNAL_V1_SUPER   0x001 /* create V1 superblock 
(deprecated) */
+ #define EXT2_MKJOURNAL_LAZYINIT   0x002 /* don't zero journal inode 
before use*/
+ 
+ struct opaque_ext2_group_desc;
+ 
+ /*
+  * The timestamp in the MMP structure will be updated by e2fsck at some
+  * arbitary intervals (start of passes, after every EXT2_MMP_INODE_INTERVAL
+  * inodes in pass1 and pass1b).  There is no guarantee that e2fsck is updating
+  * the MMP block in a timely manner, and the updates it does are purely for
+  * the convenience of the sysadmin and not for automatic validation.
+  */
+ #define EXT2_MMP_INODE_INTERVAL 2
  
  struct struct_ext2_filsys {
errcode_t   magic;
@@@ -196,10 -223,11 +223,11 @@@
int fragsize;
dgrp_t  group_desc_count;
unsigned long   desc_blocks;
-   struct ext2_group_desc *group_desc;
+   struct opaque_ext2_group_desc * group_desc;
int inode_blocks_per_group;
ext2fs_inode_bitmap inode_map;
ext2fs_block_bitmap block_map;
+   /* XXX FIXME-64: not 64-bit safe, but not used? */
errcode_t (*get_blocks)(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks);
errcode_t (*check_directory)(ext2_filsys fs, ext2_ino_t ino);
errcode_t (*write_bitmaps)(ext2_filsys fs);
@@@ -231,6 -259,18 +259,18 @@@
io_channel  image_io;
  
/*
+* Buffers for Multiple mount protection(MMP) block.
+*/
+   void *mmp_buf;
+   void *mmp_cmp;
+   int mmp_fd;
+ 
+   /*
+* Time at which e2fsck last updated the MMP block.
+*/
+   long mmp_last_written;
+ 
+   /*
 * More callback functions
 */
errcode_t (*get_alloc_block)(ext2_filsys fs, blk64_t goal,
@@@ -458,7 -498,7 +498,7 @@@ typedef struct ext2_struct_inode_scan *
  /*
   * ext2 size of an inode
   */
 -#define EXT2_I_SIZE(i)((i)-i_size | ((__u64) (i)-i_size_high  32))
 +#define EXT2_I_SIZE(i)((i).i_size | ((__u64) (i).i_size_high  32))
  
  /*
   * ext2_icount_t abstraction
@@@ -491,6 -531,12 +531,12 @@@ typedef struct ext2_icount *ext2_icount
  #define EXT2_CHECK_MAGIC(struct, code) \
  if ((struct)-magic != (code)) return (code)
  
+ /*
+  * Flags

[Pkg-lustre-svn-commit] updated: [54584fa] Removed modification of ext2fs.h in .diff.gz

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 54584fa80b88d372caaa19137ce9c4ca039ce996
Author: Patrick Winnertz win...@debian.org
Date:   Thu Apr 19 14:27:48 2012 +0200

Removed modification of ext2fs.h in .diff.gz

 Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index 7416745..6a422fe 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -498,7 +498,7 @@ typedef struct ext2_struct_inode_scan *ext2_inode_scan;
 /*
  * ext2 size of an inode
  */
-#define EXT2_I_SIZE(i) ((i).i_size | ((__u64) (i).i_size_high  32))
+#define EXT2_I_SIZE(i) ((i)-i_size | ((__u64) (i)-i_size_high  32))
 
 /*
  * ext2_icount_t abstraction

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [f65c560] Merge branch 'upstream'

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit f65c5606d1a27fb0a3ce22190e4028689dcc027b
Merge: a7940d73d53459af0b6e4fc14fc8a6e99705c75a 
d744da8f4a776e270ccf9babfba8bccbabdec30f
Author: Patrick Winnertz win...@debian.org
Date:   Fri Mar 16 11:15:27 2012 +0100

Merge branch 'upstream'


-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [ec86e88] Updated the changelog

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit ec86e88476c8efa12343b1333476720f0b0d01d9
Author: Patrick Winnertz win...@debian.org
Date:   Thu Apr 19 14:29:07 2012 +0200

Updated the changelog

 Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 280d0e7..827e021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,18 @@
-ldiskfsprogs (1.41.90.wc4+dfsg-1~1.gbp4e7920) UNRELEASED; urgency=low
+ldiskfsprogs (1.41.90.wc4+dfsg-1~2.gbp54584f) UNRELEASED; urgency=low
 
-  ** SNAPSHOT build @4e7920ec52eb3397c20a429e81214230914bcdbd **
+  ** SNAPSHOT build @54584fa80b88d372caaa19137ce9c4ca039ce996 **
 
   * bugzilla 21704 - lfsck doesn't work on pools
   * test commit to see if this small commit fixes the problem
   * Imported Upstream version 1.41.90.wc4
   * Removed somed .orig files and don't fail when the patches and series file 
is not around
-  * temp commit
+  * Added changelog entry for new ldiskfsck version
+  * Patches for ldiskfsck are now preapplied
+  * Removed the patches dir from the original sources
+  * Add libsqlite3-dev as build depends
+  * Removed modification of ext2fs.h in .diff.gz
 
- -- Patrick Winnertz win...@debian.org  Fri, 16 Mar 2012 10:54:36 +0100
+ -- Patrick Winnertz win...@debian.org  Thu, 19 Apr 2012 14:28:38 +0200
 
 ldiskfsprogs (1.41.10-2) unstable; urgency=low
 

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [66c1ff7] Removed one more patch from debian/patches/series

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 66c1ff7cee2ee4a54cab6e3f76a8e565f4d6d082
Author: Patrick Winnertz win...@debian.org
Date:   Fri Mar 16 11:18:24 2012 +0100

Removed one more patch from debian/patches/series

 Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/series b/debian/patches/series
index 16d99f1..be12e4e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 static-linking.patch
-bug21704_mds_on_pools.patch

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [f7fd2dd] depend explicitly on db4.8

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit f7fd2dddbfd7bdfc24a166f062a7038c8fdba435
Author: Patrick Winnertz win...@debian.org
Date:   Thu Apr 19 14:48:49 2012 +0200

depend explicitly on db4.8

 Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index 0311638..715f278 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 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
-Build-Depends: texi2html (= 1.76), gettext, texinfo, dc, pkg-config, 
dietlibc-dev, libsepol1-dev, libdevmapper-dev, libselinux1-dev, debhelper (= 
5.0.42), lustre-dev, libdb-dev (= 4.7), quilt, libsqlite3-dev
+Build-Depends: texi2html (= 1.76), gettext, texinfo, dc, pkg-config, 
dietlibc-dev, libsepol1-dev, libdevmapper-dev, libselinux1-dev, debhelper (= 
5.0.42), lustre-dev, libdb4.8-dev (= 4.7), quilt, libsqlite3-dev
 Standards-Version: 3.8.2
 Homepage: http://www.lustre.org
 

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] created: [a7396a3] Imported Upstream version 1.8.7-wc1+dfsg

[Patrick Winnertz]

The annotated tag, upstream/1.8.7-wc1+dfsg has been created
at  30c94d9afbaad0266d1b61564a601caf87f68163 (tag)
   tagging  a7396a3951825cda24cd0bef43b5d246b9570c6e (commit)
  replaces  upstream/1.8.5+dfsg
 tagged by  Patrick Winnertz
on  Wed Nov 16 13:56:05 2011 +0100

- Shortlog 
Upstream version 1.8.7-wc1+dfsg

Patrick Winnertz (1):
  Imported Upstream version 1.8.7-wc1+dfsg

---

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

[Pkg-lustre-svn-commit] updated: [e5d5d4d] Merge commit 'upstream/1.8.7-wc1+dfsg'

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit e5d5d4dbeffca0431068e4d2c5bdf99d17bd57c5
Merge: 30153585947fe905bfb194b208cd308a6298139b 
a7396a3951825cda24cd0bef43b5d246b9570c6e
Author: Patrick Winnertz win...@debian.org
Date:   Wed Nov 16 13:56:06 2011 +0100

Merge commit 'upstream/1.8.7-wc1+dfsg'


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

[Pkg-lustre-svn-commit] updated: [50cd7c2] Remove autogen.sh patch as autogen.sh is provided by source

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 50cd7c242fb8db3653e3ddfa4fb8b1a55654c55b
Author: Patrick Winnertz win...@debian.org
Date:   Wed Nov 16 13:59:44 2011 +0100

Remove autogen.sh patch as autogen.sh is provided by source

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/series b/debian/patches/series
index ee2b8e3..d58ff1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ page-size-undef-fixes.patch
 posix_acl.patch
 ldiskfs-detect-2.6.20-2.6.22.patch
 no_default_debugging.patch
-autogen.sh.patch
 no-darwin.patch
 libsysio.patch
 bug12769-ql-fix.patch

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

[Pkg-lustre-svn-commit] updated: [4250680] temp commit for build test

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 42506807bd305d0aa81eda8556aeb33201436df0
Author: Patrick Winnertz win...@debian.org
Date:   Wed Nov 16 14:16:40 2011 +0100

temp commit for build test

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 124a76d..bfed398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+lustre (1.8.7-wc1+dfsg-1~2.gbpd80fe2) UNRELEASED; urgency=low
+
+  ** SNAPSHOT build @d80fe227553f110cd9755f6cd4640de0e58d94d2 **
+
+  * [a7396a3] Imported Upstream version 1.8.7-wc1+dfsg
+  * [50cd7c2] Remove autogen.sh patch as autogen.sh is provided by source
+  * [65422a6] Fix some patches to apply to the newest upstream release of 1.8
+  * [d80fe22] Bump automake version to 1.11 (Closes: #648585)
+
+ -- Patrick Winnertz win...@debian.org  Wed, 16 Nov 2011 14:16:27 +0100
+
 lustre (1.8.5+dfsg-3) unstable; urgency=low
 
   * [9194f2d] Build ldiskfs kernel module also on plain 
diff --git a/debian/patches/fix-oot-builds.patch 
b/debian/patches/fix-oot-builds.patch
index 62fd7d8..63a9ef4 100644
--- a/debian/patches/fix-oot-builds.patch
+++ b/debian/patches/fix-oot-builds.patch
@@ -4,8 +4,8 @@
 
 Index: lustre/build/autoconf/lustre-build.m4
 ===
 lustre.orig/build/autoconf/lustre-build.m4 2011-11-16 13:56:06.0 
+0100
-+++ lustre/build/autoconf/lustre-build.m4  2011-11-16 14:05:34.568439809 
+0100
+--- lustre.orig/build/autoconf/lustre-build.m4 2011-11-16 14:47:46.916997055 
+0100
 lustre/build/autoconf/lustre-build.m4  2011-11-16 15:16:57.297676717 
+0100
 @@ -864,7 +864,7 @@
CC=$CC -m64
  fi
@@ -17,8 +17,8 @@ Index: lustre/build/autoconf/lustre-build.m4
  AC_SUBST(LLCPPFLAGS)
 Index: lustre/lustre/autoMakefile.am
 ===
 lustre.orig/lustre/autoMakefile.am 2011-11-16 13:56:07.0 +0100
-+++ lustre/lustre/autoMakefile.am  2011-11-16 14:05:34.568439809 +0100
+--- lustre.orig/lustre/autoMakefile.am 2011-11-16 14:47:46.924997088 +0100
 lustre/lustre/autoMakefile.am  2011-11-16 15:16:57.297676717 +0100
 @@ -85,7 +85,7 @@
  BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
  
@@ -30,16 +30,16 @@ Index: lustre/lustre/autoMakefile.am
  $(RM) tmpver tmpdiff ||   
\
 Index: lustre/lustre/scripts/version_tag.pl
 ===
 lustre.orig/lustre/scripts/version_tag.pl  2011-11-16 13:56:07.0 
+0100
-+++ lustre/lustre/scripts/version_tag.pl   2011-11-16 14:10:27.209890939 
+0100
+--- lustre.orig/lustre/scripts/version_tag.pl  2011-11-16 14:47:46.936997153 
+0100
 lustre/lustre/scripts/version_tag.pl   2011-11-16 15:32:18.422244336 
+0100
 @@ -47,17 +47,19 @@
  !$ver-open($objdir/include/linux/version.h) 
  !$ver-open($dir/include/linux/utsrelease.h) 
  !$ver-open($dir/include/linux/version.h)) {
 -die Run make dep on '$dir'\n;
 -}
-+ #   die Run make dep on '$dir'\n;
-+  $kernver= UNKOWN-KERNEL;
++#die Run make dep on '$dir'\n;
++  $kernver = UNKOWN-KERNEL;
 +} else {
  
 -while(defined($line = $ver)) {
@@ -48,25 +48,34 @@ Index: lustre/lustre/scripts/version_tag.pl
 -$kernver = $1;
 -last;
 -}
-+  while(defined($line = $ver)) {
-+  $line =~ /\#define UTS_RELEASE (.*)/;
-+  if ($1) {
-+  $kernver = $1;
-+  last;
-+  }
-+  }
-+  $ver-close();
++  while(defined($line = $ver)) {
++  $line =~ /\#define UTS_RELEASE (.*)/;
++  if ($1) {
++  $kernver = $1;
++  last;
++  }
++  }
++  $ver-close();
  }
 -$ver-close();
  chomp($kernver);
  return $kernver;
  
+@@ -132,7 +134,7 @@
+ } else {
+ die(a tree status can only be determined in an source code control 
system checkout\n)
+ if ($progname eq make_META.pl);
+-require version_tag-none.pl;
++#require version_tag-none.pl;
+ }
+ 
+ ($am_linuxdir, $am_linuxobjdir, $am_modules, $am_version, $local_version,
 @@ -143,6 +145,8 @@
  my $buildid = get_buildid();
  
  if ($progname eq version_tag.pl) {
 +chdir($cwd);
-+chdir($ARGV[1]);
++chdir($ARG[1]);
  my $kernver = ;
  $kernver = get_kernver($am_linuxdir, $am_linuxobjdir)
  if ($am_linuxdir ne );

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

[Pkg-lustre-svn-commit] updated: [65422a6] Fix some patches to apply to the newest upstream release of 1.8

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 65422a642636c2e91e646b8b7dffc7d5e2d024fb
Author: Patrick Winnertz win...@debian.org
Date:   Wed Nov 16 14:13:30 2011 +0100

Fix some patches to apply to the newest upstream release of 1.8

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/fix-oot-builds.patch 
b/debian/patches/fix-oot-builds.patch
index e6e24a6..62fd7d8 100644
--- a/debian/patches/fix-oot-builds.patch
+++ b/debian/patches/fix-oot-builds.patch
@@ -4,9 +4,9 @@
 
 Index: lustre/build/autoconf/lustre-build.m4
 ===
 lustre.orig/build/autoconf/lustre-build.m4 2010-12-07 16:54:32.365545003 
+0100
-+++ lustre/build/autoconf/lustre-build.m4  2010-12-07 17:00:45.137545002 
+0100
-@@ -737,7 +737,7 @@
+--- lustre.orig/build/autoconf/lustre-build.m4 2011-11-16 13:56:06.0 
+0100
 lustre/build/autoconf/lustre-build.m4  2011-11-16 14:05:34.568439809 
+0100
+@@ -864,7 +864,7 @@
CC=$CC -m64
  fi
  
@@ -17,8 +17,8 @@ Index: lustre/build/autoconf/lustre-build.m4
  AC_SUBST(LLCPPFLAGS)
 Index: lustre/lustre/autoMakefile.am
 ===
 lustre.orig/lustre/autoMakefile.am 2010-12-07 16:54:32.369545003 +0100
-+++ lustre/lustre/autoMakefile.am  2010-12-07 17:00:45.137545002 +0100
+--- lustre.orig/lustre/autoMakefile.am 2011-11-16 13:56:07.0 +0100
 lustre/lustre/autoMakefile.am  2011-11-16 14:05:34.568439809 +0100
 @@ -85,7 +85,7 @@
  BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
  
@@ -30,45 +30,43 @@ Index: lustre/lustre/autoMakefile.am
  $(RM) tmpver tmpdiff ||   
\
 Index: lustre/lustre/scripts/version_tag.pl
 ===
 lustre.orig/lustre/scripts/version_tag.pl  2010-12-07 16:54:32.385545003 
+0100
-+++ lustre/lustre/scripts/version_tag.pl   2010-12-07 17:00:45.137545002 
+0100
-@@ -166,17 +166,19 @@
+--- lustre.orig/lustre/scripts/version_tag.pl  2011-11-16 13:56:07.0 
+0100
 lustre/lustre/scripts/version_tag.pl   2011-11-16 14:10:27.209890939 
+0100
+@@ -47,17 +47,19 @@
  !$ver-open($objdir/include/linux/version.h) 
  !$ver-open($dir/include/linux/utsrelease.h) 
  !$ver-open($dir/include/linux/version.h)) {
 -die Run make dep on '$dir'\n;
--}
--
+-}
++ #   die Run make dep on '$dir'\n;
++  $kernver= UNKOWN-KERNEL;
++} else {
+ 
 -while(defined($line = $ver)) {
 -$line =~ /\#define UTS_RELEASE (.*)/;
 -if ($1) {
 -$kernver = $1;
 -last;
 -}
--}
++  while(defined($line = $ver)) {
++  $line =~ /\#define UTS_RELEASE (.*)/;
++  if ($1) {
++  $kernver = $1;
++  last;
++  }
++  }
++  $ver-close();
+ }
 -$ver-close();
-+#die Run make dep on '$dir'\n;
-+  $kernver = UNKOWN-KERNEL;
-+} else {
-+
-+  while(defined($line = $ver)) {
-+  $line =~ /\#define UTS_RELEASE (.*)/;
-+  if ($1) {
-+  $kernver = $1;
-+  last;
-+  }
-+  }
-+  $ver-close();
-+  }
  chomp($kernver);
- $dir =~ s/\//\./g;
- return $dir;
-@@ -254,6 +256,8 @@
- if (!defined($ENV{LUSTRE_VERS}));
+ return $kernver;
+ 
+@@ -143,6 +145,8 @@
+ my $buildid = get_buildid();
  
  if ($progname eq version_tag.pl) {
 +chdir($cwd);
 +chdir($ARGV[1]);
- my $linuxdir = get_linuxdir();
- $linuxdir =~ s/\//\./g;
- generate_ver($tag, $mtime, $linuxdir);
+ my $kernver = ;
+ $kernver = get_kernver($am_linuxdir, $am_linuxobjdir)
+ if ($am_linuxdir ne );
diff --git a/debian/patches/fix_bashisms_for_dash.patch 
b/debian/patches/fix_bashisms_for_dash.patch
index 51a195f..3a19fea 100644
--- a/debian/patches/fix_bashisms_for_dash.patch
+++ b/debian/patches/fix_bashisms_for_dash.patch
@@ -3,9 +3,9 @@
 
 Index: lustre/ldiskfs/configure.ac
 ===
 lustre.orig/ldiskfs/configure.ac   2010-12-07 16:59:06.421545002 +0100
-+++ lustre/ldiskfs/configure.ac2010-12-07 17:00:50.253545002 +0100
-@@ -93,7 +93,7 @@
+--- lustre.orig/ldiskfs/configure.ac   2011-11-16 14:10:52.0 +0100
 lustre/ldiskfs/configure.ac2011-11-16 14:11:58.646344345 +0100
+@@ -107,7 +107,7 @@
  fi
  
  AC_SUBST(BACKFS)
@@ -16,8 +16,8 @@ Index: lustre/ldiskfs/configure.ac
  AM_CONDITIONAL(USE_EXT4, test x$enable_ext4 = xyes)
 Index: lustre/lustre/tests/llog-test.sh
 ===
 lustre.orig/lustre/tests/llog-test.sh  2010-12-07 16:54:32.297545003 
+0100
-+++ lustre/lustre/tests/llog-test.sh

[Pkg-lustre-svn-commit] updated: [69a87d1] New 1.8.7+dfsg-1 version of lustre

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 69a87d1c62e8eee6a710d9f13fb8929da73a6c3e
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 2 11:30:18 2011 +0100

New 1.8.7+dfsg-1 version of lustre

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index bfed398..7ffda92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,12 @@
-lustre (1.8.7-wc1+dfsg-1~2.gbpd80fe2) UNRELEASED; urgency=low
-
-  ** SNAPSHOT build @d80fe227553f110cd9755f6cd4640de0e58d94d2 **
+lustre (1.8.7-wc1+dfsg-1) unstable; urgency=low
 
   * [a7396a3] Imported Upstream version 1.8.7-wc1+dfsg
   * [50cd7c2] Remove autogen.sh patch as autogen.sh is provided by source
   * [65422a6] Fix some patches to apply to the newest upstream release of 1.8
-  * [d80fe22] Bump automake version to 1.11 (Closes: #648585)
+  * [d80fe22] Bump automake version to 1.11 (Closes: #648585)OC
+  * [5f80796] add libncurses-dev to build readline support (Closes: #646739)
 
- -- Patrick Winnertz win...@debian.org  Wed, 16 Nov 2011 14:16:27 +0100
+ -- Patrick Winnertz win...@debian.org  Fri, 02 Dec 2011 11:29:51 +0100
 
 lustre (1.8.5+dfsg-3) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] updated: [5f80796] add libncurses-dev to build readline support (Closes: #646739)

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 5f8079647a86312662578e57dc5076019843673b
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 2 11:25:51 2011 +0100

add libncurses-dev to build readline support (Closes: #646739)

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index 8c7693e..61ce9c6 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.9.1
-Build-Depends: libreadline-dev, debhelper (=6.0.7), dh-kpatches (= 0.99.3), 
lyx, automake1.11, libsnmp-dev, bzip2, texlive-extra-utils, quilt, 
texlive-latex-recommended, libncurses-dev
+Build-Depends: libreadline-dev, debhelper (=6.0.7), dh-kpatches (= 0.99.3), 
lyx, automake1.11, libsnmp-dev, bzip2, texlive-extra-utils, quilt, 
texlive-latex-recommended, libncurses-dev 
 Homepage: http://www.lustre.org/
 Vcs-Git: git://git.lustre.org/prime/lustre.git
 

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

[Pkg-lustre-svn-commit] updated: [fc42004] Fix oot-builds with 1.8.7 - the META file was generated in a checkout of the 1.8.7_wc1 tag

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit fc42004f191361a00a463431d6da129da0d31f51
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 2 13:57:28 2011 +0100

Fix oot-builds with 1.8.7 - the META file was generated in a checkout of 
the 1.8.7_wc1 tag

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/fix-oot-builds.patch 
b/debian/patches/fix-oot-builds.patch
index 63a9ef4..e9e18cc 100644
--- a/debian/patches/fix-oot-builds.patch
+++ b/debian/patches/fix-oot-builds.patch
@@ -4,8 +4,8 @@
 
 Index: lustre/build/autoconf/lustre-build.m4
 ===
 lustre.orig/build/autoconf/lustre-build.m4 2011-11-16 14:47:46.916997055 
+0100
-+++ lustre/build/autoconf/lustre-build.m4  2011-11-16 15:16:57.297676717 
+0100
+--- lustre.orig/build/autoconf/lustre-build.m4 2011-12-02 13:55:25.637462571 
+0100
 lustre/build/autoconf/lustre-build.m4  2011-12-02 13:56:45.649859332 
+0100
 @@ -864,7 +864,7 @@
CC=$CC -m64
  fi
@@ -17,8 +17,8 @@ Index: lustre/build/autoconf/lustre-build.m4
  AC_SUBST(LLCPPFLAGS)
 Index: lustre/lustre/autoMakefile.am
 ===
 lustre.orig/lustre/autoMakefile.am 2011-11-16 14:47:46.924997088 +0100
-+++ lustre/lustre/autoMakefile.am  2011-11-16 15:16:57.297676717 +0100
+--- lustre.orig/lustre/autoMakefile.am 2011-12-02 13:55:25.637462571 +0100
 lustre/lustre/autoMakefile.am  2011-12-02 13:56:45.649859332 +0100
 @@ -85,7 +85,7 @@
  BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
  
@@ -30,9 +30,20 @@ Index: lustre/lustre/autoMakefile.am
  $(RM) tmpver tmpdiff ||   
\
 Index: lustre/lustre/scripts/version_tag.pl
 ===
 lustre.orig/lustre/scripts/version_tag.pl  2011-11-16 14:47:46.936997153 
+0100
-+++ lustre/lustre/scripts/version_tag.pl   2011-11-16 15:32:18.422244336 
+0100
-@@ -47,17 +47,19 @@
+--- lustre.orig/lustre/scripts/version_tag.pl  2011-12-02 13:55:25.645462592 
+0100
 lustre/lustre/scripts/version_tag.pl   2011-12-02 13:57:14.826004007 
+0100
+@@ -8,8 +8,9 @@
+ 
+ my $file = new IO::File;
+ my ($line, $dir, $objdir, $modules, $version, $local_version, $buildid);
++chomp(my $cwd = `pwd`);
+ if (!$file-open(autoMakefile)) {
+-die Run ./configure first\n;
++die We are $cwd in Run ./configure first\n;
+ }
+ $modules = 1;
+ while (defined($line = $file)) {
+@@ -47,17 +48,19 @@
  !$ver-open($objdir/include/linux/version.h) 
  !$ver-open($dir/include/linux/utsrelease.h) 
  !$ver-open($dir/include/linux/version.h)) {
@@ -61,21 +72,41 @@ Index: lustre/lustre/scripts/version_tag.pl
  chomp($kernver);
  return $kernver;
  
-@@ -132,7 +134,7 @@
- } else {
- die(a tree status can only be determined in an source code control 
system checkout\n)
- if ($progname eq make_META.pl);
--require version_tag-none.pl;
-+#require version_tag-none.pl;
+@@ -118,7 +121,7 @@
+ # ARGV[0] = srcdir
+ # ARGV[1] = builddir
+ 
+-# need to be in srcdir
++# need to be in builddir
+ if ($ARGV[0]) {
+ chdir($ARGV[0]);
+ }
+@@ -135,6 +138,8 @@
+ require version_tag-none.pl;
  }
  
++chdir($cwd);
++chdir($ARGV[1]);
  ($am_linuxdir, $am_linuxobjdir, $am_modules, $am_version, $local_version,
-@@ -143,6 +145,8 @@
+  $am_buildid) = read_autoMakefile();
+ 
+@@ -143,6 +148,8 @@
  my $buildid = get_buildid();
  
  if ($progname eq version_tag.pl) {
 +chdir($cwd);
-+chdir($ARG[1]);
++chdir($ARGV[1]);
  my $kernver = ;
  $kernver = get_kernver($am_linuxdir, $am_linuxobjdir)
  if ($am_linuxdir ne );
+Index: lustre/META
+===
+--- /dev/null  1970-01-01 00:00:00.0 +
 lustre/META2011-12-02 13:57:06.573963089 +0100
+@@ -0,0 +1,6 @@
++TAG = v1_8_7_WC1
++VERSION = 1.8.7
++BUILDID = 
++PRISTINE = 0
++LOCAL_VERSION =
++ 

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

[Pkg-lustre-svn-commit] updated: [bab8cc9] changelog for -3 upload to unstable

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit bab8cc9c2dde550e44227782f564ac0d57246bf8
Author: Patrick Winnertz win...@debian.org
Date:   Wed Nov 16 11:19:40 2011 +0100

changelog for -3 upload to unstable

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index e186307..e19faf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lustre (1.8.5+dfsg-3) unstable; urgency=low
+
+  * [9194f2d] Build ldiskfs kernel module also on plain 
+debian kernel (2.6.32)
+
+ -- Patrick Winnertz win...@debian.org  Wed, 16 Nov 2011 11:19:02 +0100
+
 lustre (1.8.5+dfsg-2) unstable; urgency=low
 
   * [2362539] the lib should be installed in /usr/lib/lustre-1.8 

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

[Pkg-lustre-svn-commit] updated: [9194f2d] Build ldiskfs kernel module also on plain debian kernel

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 9194f2d6cd955f98e57f278b38550727a4cd15a9
Author: Patrick Winnertz win...@debian.org
Date:   Fri Aug 5 11:11:37 2011 +0200

Build ldiskfs kernel module also on plain debian kernel

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch 
b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
index af2ff69..c8d08a6 100644
--- a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
+++ b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
@@ -3,9 +3,9 @@
 
 Index: lustre/ldiskfs/configure.ac
 ===
 lustre.orig/ldiskfs/configure.ac   2010-12-07 16:54:33.185545003 +0100
-+++ lustre/ldiskfs/configure.ac2010-12-07 16:59:06.421545002 +0100
-@@ -114,11 +114,16 @@
+--- lustre.orig/ldiskfs/configure.ac   2011-08-05 11:10:05.195251849 +0200
 lustre/ldiskfs/configure.ac2011-08-05 11:11:19.987622721 +0200
+@@ -114,13 +114,18 @@
  else
LDISKFS_SERIES=2.6-rhel5.series
  fi
@@ -21,5 +21,8 @@ Index: lustre/ldiskfs/configure.ac
  2.6.22*) LDISKFS_SERIES=2.6.22-vanilla.series;;
 +2.6.26*) LDISKFS_SERIES=2.6.26-vanilla.series;;
  2.6.27*) LDISKFS_SERIES=2.6-sles11.series;;
- 2.6.32.*) LDISKFS_SERIES=2.6-sles11.series;;
+-2.6.32.*) LDISKFS_SERIES=2.6-sles11.series;;
++2.6.32*) LDISKFS_SERIES=2.6-sles11.series;;
  *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix 
ldiskfs/configure.ac])
+ esac
+ AC_MSG_RESULT([$LDISKFS_SERIES])

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

[Pkg-lustre-svn-commit] updated: [3015358] prepare for -3 upload

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 30153585947fe905bfb194b208cd308a6298139b
Author: Patrick Winnertz win...@debian.org
Date:   Wed Nov 16 13:36:55 2011 +0100

prepare for -3 upload

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index e19faf1..124a76d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ lustre (1.8.5+dfsg-3) unstable; urgency=low
 
   * [9194f2d] Build ldiskfs kernel module also on plain 
 debian kernel (2.6.32)
+  * [897600b] move modifcations from .diff.gz to 
+modified-debian-specific-stuff.patch (Closes: #643209)
+  * [5dbe9c8] Don't depend anymore on automake1.7 (Closes: #648585)
 
- -- Patrick Winnertz win...@debian.org  Wed, 16 Nov 2011 11:19:02 +0100
+ -- Patrick Winnertz win...@debian.org  Wed, 16 Nov 2011 13:36:11 +0100
 
 lustre (1.8.5+dfsg-2) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] updated: [5dbe9c8] Don't depend anymore on automake1.7 (Closes: #648585)

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 5dbe9c83ec5020dc7b417b26264c931c3dd490b0
Author: Patrick Winnertz win...@debian.org
Date:   Wed Nov 16 13:35:49 2011 +0100

Don't depend anymore on automake1.7 (Closes: #648585)

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index 361040b..bf51f61 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.9.1
-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
+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, libncurses-dev
 Homepage: http://www.lustre.org/
 Vcs-Git: git://git.lustre.org/prime/lustre.git
 

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

[Pkg-lustre-svn-commit] updated: [d7b87bd] Add -Wl, --no-add-needed as linkerflags to debian/rules

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit d7b87bd5ea1051114e8078c705cb65ddfbf08521
Author: Patrick Winnertz win...@debian.org
Date:   Thu Mar 17 10:58:47 2011 +0100

Add -Wl,--no-add-needed as linkerflags to debian/rules

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/rules b/debian/rules
index de3b54d..1c9c68c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,8 @@ DEB_BUILD_GNU_SYSTEM = $(shell dpkg-architecture 
-qDEB_BUILD_GNU_SYSTEM)
 DEB_BUILD_GNU_CPU = $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 
 CFLAGS = -Wall -g
+LDFLAGS = -Wl,--no-add-needed
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
 else

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

[Pkg-lustre-svn-commit] updated: [0517031] Add a patch for building with -Wl, --no-add-needed (Closes: #615749)

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 05170315c0db2ac583bf6065856776411d1910fa
Author: Patrick Winnertz win...@debian.org
Date:   Thu Mar 17 11:22:37 2011 +0100

Add a patch for building with -Wl,--no-add-needed (Closes: #615749)

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/615749_no_add_needed 
b/debian/patches/615749_no_add_needed
new file mode 100644
index 000..49c2e83
--- /dev/null
+++ b/debian/patches/615749_no_add_needed
@@ -0,0 +1,14 @@
+Add missing -lpthread to the linking arguments of liblustreapi.a
+Index: lustre/lustre/tests/Makefile.am
+===
+--- lustre.orig/lustre/tests/Makefile.am   2011-03-17 11:19:36.220315409 
+0100
 lustre/lustre/tests/Makefile.am2011-03-17 11:21:06.120761199 +0100
+@@ -61,7 +61,7 @@
+ mmap_sanity_SOURCES= mmap_sanity.c
+ 
+ LIBLUSTREAPI := $(top_builddir)/lustre/utils/liblustreapi.a
+-multiop_LDADD=$(LIBLUSTREAPI) -lrt
++multiop_LDADD=$(LIBLUSTREAPI) -lrt -lpthread
+ 
+ ll_dirstripe_verify_SOURCES= ll_dirstripe_verify.c
+ ll_dirstripe_verify_LDADD= -L$(top_builddir)/lustre/utils -llustreapi
diff --git a/debian/patches/series b/debian/patches/series
index 2f87c1b..2a370bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ fix_bashisms_for_dash.patch
 fix_dentry_conf_test.patch
 spelling_errors.patch
 cacheflush_remove_mark_rodata.patch
+615749_no_add_needed

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

[Pkg-lustre-svn-commit] updated: [14e5cc4] lustre is since a long time maintained in a git vcs.. not in the old cvs anymore

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 14e5cc435b11be5239c7ccb13288708e306fb54e
Author: Patrick Winnertz win...@debian.org
Date:   Thu Mar 17 11:53:52 2011 +0100

lustre is since a long time maintained in a git vcs.. not in the old cvs 
anymore

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index 5583885..3510492 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ 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, quilt, 
texlive-latex-recommended
 Homepage: http://www.lustre.org/
-Vcs-Cvs: -d :pserver:anonym...@cvs.lustre.org:/lustre
+Vcs-Git: git://git.lustre.org/prime/lustre.git
 
 Package: linux-patch-lustre
 Section: kernel

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

[Pkg-lustre-svn-commit] updated: [a66324e] Bump standards version to 3.9.1 - no further changes needed

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit a66324e4e078b67c19406d29019c88ffc9eb43e7
Author: Patrick Winnertz win...@debian.org
Date:   Thu Mar 17 11:54:25 2011 +0100

Bump standards version to 3.9.1 - no further changes needed

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index 3510492..361040b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 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
+Standards-Version: 3.9.1
 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-Git: git://git.lustre.org/prime/lustre.git

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

[Pkg-lustre-svn-commit] updated: [a1e88b4] Prepare for a -2 upload to unstable Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit a1e88b4f2436292e838408505a7d289d05eaca9a
Author: Patrick Winnertz win...@debian.org
Date:   Thu Mar 17 11:57:53 2011 +0100

Prepare for a -2 upload to unstable
Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 4946c1a..e186307 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+lustre (1.8.5+dfsg-2) unstable; urgency=low
+
+  * [2362539] the lib should be installed in /usr/lib/lustre-1.8 
+and not in lustre-1.6
+  * [d7b87bd] Add -Wl,--no-add-needed as linkerflags to debian/rules
+  * [0517031] Add a patch for building with 
+-Wl,--no-add-needed (Closes: #615749)
+  * [14e5cc4] lustre is since a long time maintained in a git vcs...
+  * [a66324e] Bump standards version to 3.9.1 - no further changes needed
+
+ -- Patrick Winnertz win...@debian.org  Thu, 17 Mar 2011 11:56:54 +0100
+
 lustre (1.8.5+dfsg-1) unstable; urgency=low
 
   * [b396782] Imported Upstream version 1.8.5+dfsg

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

[Pkg-lustre-svn-commit] updated: [3e690ca] Updated changelog entry for 1.8.5-1 Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 3e690ca8b9bc6752bcd8335f2a4121623e94335c
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 10 15:05:45 2010 +0100

Updated changelog entry for 1.8.5-1
Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index abb618d..765e326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,26 @@
-lustre (1.8.5+dfsg-1~1.gbp54a3db) UNRELEASED; urgency=low
-
-  ** SNAPSHOT build @54a3db5e78153119fc7dbe2ee0b2e7086dfe0865 **
+lustre (1.8.5+dfsg-1) unstable; urgency=low
 
   * [b396782] Imported Upstream version 1.8.5+dfsg
-
- -- Patrick Winnertz win...@debian.org  Tue, 07 Dec 2010 12:55:30 +0100
+  * [fff132c] Move to 3.0 (quilt)
+  * [dad99d6] Add a series file
+  * [51aa515] Comment out two patches which doesn't apply with quilt
+currently
+  * [2af3035] Refresh all patches using quilt refresh
+  * [c8394bc] Remove dpatch from build-depends, we're using only quilt
+now
+  * [50c03e5] Fix a lintian warnings concerning the manpage of lctl and
+lustre
+  * [53e15ec] Remove unused lintian overrides
+  * [629cb8f] Merge fix-lustre-manpage.patch and lustre_manpages.patch
+  * [0542c74] cleaned up debian/patches/ - removed unused stuff
+  * [5758022] Install all new manpages into the packages
+  * [2e982eb] Removed unused overrides
+  * [e890c68] Fix some more lintian warnings and errors in the lustre
+packages
+  * [4d5e398] Fix some more lintian warnings
+  * [4fe0a09] Updated changelog entry for 1.8.5-1
+
+ -- Patrick Winnertz win...@debian.org  Fri, 10 Dec 2010 15:06:00 +0100
 
 lustre (1.8.4-1) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] updated: [66dda83] Temp commit for lenny

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 66dda836fd0775a6a2158f7c9d2c6459ea845932
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 10 15:17:41 2010 +0100

Temp commit for lenny

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 765e326..b912cd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lustre (1.8.5+dfsg-1) unstable; urgency=low
+lustre (1.8.5+dfsg-0.credativ.lenny.1) unstable; urgency=low
 
   * [b396782] Imported Upstream version 1.8.5+dfsg
   * [fff132c] Move to 3.0 (quilt)

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

[Pkg-lustre-svn-commit] updated: [f5d142f] Remove mark_rodata_ro and mark_rodata_rw from cacheflush.h as it is redefined in main.c

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit f5d142f561cca02f8dc814075bc03393bd5d233d
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 17 13:16:14 2010 +0100

Remove mark_rodata_ro and mark_rodata_rw from cacheflush.h as
it is redefined in main.c

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/cacheflush_remove_mark_rodata.patch 
b/debian/patches/cacheflush_remove_mark_rodata.patch
new file mode 100644
index 000..0b5a509
--- /dev/null
+++ b/debian/patches/cacheflush_remove_mark_rodata.patch
@@ -0,0 +1,37 @@
+diff --git a/lustre/kernel_patches/patches/cacheflush_remove_mark_rodata.patch 
b/lustre/kernel_patches/patches/cacheflush_remove_mark_rodata.patch
+new file mode 100644
+index 000..a73080d
+--- /dev/null
 b/lustre/kernel_patches/patches/cacheflush_remove_mark_rodata.patch
+@@ -0,0 +1,12 @@
++diff -Nurwd linux-2.6.32.19-0.2.orig/arch/x86/include/asm/cacheflush.h 
linux-2.6.32.19-0.2/arch/x86/include/asm/cacheflush.h
++--- linux-2.6.32.19-0.2.orig/arch/x86/include/asm/cacheflush.h
2010-12-17 13:06:00.980980003 +0100
+ linux-2.6.32.19-0.2/arch/x86/include/asm/cacheflush.h 2010-12-17 
13:11:31.488980002 +0100
++@@ -189,8 +189,6 @@
++ void set_kernel_text_rw(void);
++ void set_kernel_text_ro(void);
++ #else
++-static inline void mark_rodata_ro(void) { }
++-static inline void mark_rodata_rw(void) { }
++ static inline void set_kernel_text_rw(void) { }
++ static inline void set_kernel_text_ro(void) { }
++ #endif
+diff --git a/lustre/kernel_patches/series/2.6-sles11-2.6.32.series 
b/lustre/kernel_patches/series/2.6-sles11-2.6.32.series
+new file mode 100644
+index 000..3478c30
+--- /dev/null
 b/lustre/kernel_patches/series/2.6-sles11-2.6.32.series
+@@ -0,0 +1,13 @@
++lustre_version.patch
++vfs_races-2.6.22-vanilla.patch
++iopen-misc-2.6.22-vanilla.patch
++export-truncate-2.6.18-vanilla.patch 
++dev_read_only-2.6.27-vanilla.patch 
++export-2.6.27-vanilla.patch 
++export-show_task-2.6.27-vanilla.patch 
++sd_iostats-2.6.32-vanilla.patch
++md-mmp-unplug-dev-sles11.patch
++quota-support-64-bit-quota-format.patch
++jbd2-jcberr-2.6-sles11.patch
++jbd2_stats_proc_init-wrong-place.patch
++cacheflush_remove_mark_rodata.patch
diff --git a/debian/patches/series b/debian/patches/series
index 9fc9cb8..2f87c1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ no-strict-aliasing.patch
 fix_bashisms_for_dash.patch
 fix_dentry_conf_test.patch
 spelling_errors.patch
+cacheflush_remove_mark_rodata.patch

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

[Pkg-lustre-svn-commit] updated: [f19e77e] Revert Temp commit for lenny

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit f19e77e37dd1f1d1db6f1b47fdcc56d8d68ff9b4
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 17 13:22:17 2010 +0100

Revert Temp commit for lenny

This reverts commit 66dda836fd0775a6a2158f7c9d2c6459ea845932.

diff --git a/debian/changelog b/debian/changelog
index b912cd6..765e326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lustre (1.8.5+dfsg-0.credativ.lenny.1) unstable; urgency=low
+lustre (1.8.5+dfsg-1) unstable; urgency=low
 
   * [b396782] Imported Upstream version 1.8.5+dfsg
   * [fff132c] Move to 3.0 (quilt)

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

[Pkg-lustre-svn-commit] updated: [cc561ad] Updated changelog entry

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit cc561ad9d742dce37b49aabc9fc48dfa3b31ac91
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 17 13:27:09 2010 +0100

Updated changelog entry

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 765e326..4946c1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ lustre (1.8.5+dfsg-1) unstable; urgency=low
 packages
   * [4d5e398] Fix some more lintian warnings
   * [4fe0a09] Updated changelog entry for 1.8.5-1
+  * [f5d142f] Remove mark_rodata_ro and mark_rodata_rw from cacheflush.h
 
- -- Patrick Winnertz win...@debian.org  Fri, 10 Dec 2010 15:06:00 +0100
+ -- Patrick Winnertz win...@debian.org  Fri, 17 Dec 2010 13:26:08 +0100
 
 lustre (1.8.4-1) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] updated: [dad99d6] Add a series file

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit dad99d6a97cdc4c9c4be7c10fa49645d4bacf7ea
Author: Patrick Winnertz win...@debian.org
Date:   Tue Dec 7 16:47:14 2010 +0100

Add a series file

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000..6ff8af9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,28 @@
+# patches
+page-size-undef-fixes.patch
+#inode-no-i_blksize-2.6.20.patch
+posix_acl.patch
+ldiskfs-detect-2.6.20-2.6.22.patch
+no_default_debugging.patch
+autogen.sh.patch
+no-darwin.patch
+libsysio.patch
+bug12769-ql-fix.patch
+bug15587_security.capability_xattr.patch
+# Debian patches
+bash_completion.patch
+lustre_manpage.patch
+tex2pdf.patch
+lustre_config.patch
+fix-2.6.15-versioncheck.patch
+bug13852-quota_includes.patch
+fix-lustre-manpage.patch
+enable-quota.patch
+fix-symlink-attack.patch
+use_bash_instead_of_sh.patch
+#hotfixes for 1.8.2:
+fix-oot-builds.patch
+fix_various_typecasts.patch
+no-strict-aliasing.patch
+fix_bashisms_for_dash.patch
+fix_dentry_conf_test.patch

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

[Pkg-lustre-svn-commit] updated: [51aa515] Comment out two patches which doesn't apply with quilt currently

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 51aa51597b0de7a64aef5b14680fefa8c3e3d8b5
Author: Patrick Winnertz win...@debian.org
Date:   Tue Dec 7 16:54:50 2010 +0100

Comment out two patches which doesn't apply with quilt currently

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/series b/debian/patches/series
index 6ff8af9..6c7b1da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,13 +16,13 @@ tex2pdf.patch
 lustre_config.patch
 fix-2.6.15-versioncheck.patch
 bug13852-quota_includes.patch
-fix-lustre-manpage.patch
+###fix-lustre-manpage.patch
 enable-quota.patch
 fix-symlink-attack.patch
 use_bash_instead_of_sh.patch
 #hotfixes for 1.8.2:
 fix-oot-builds.patch
-fix_various_typecasts.patch
+###fix_various_typecasts.patch
 no-strict-aliasing.patch
 fix_bashisms_for_dash.patch
 fix_dentry_conf_test.patch

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

[Pkg-lustre-svn-commit] updated: [629cb8f] Merge fix-lustre-manpage.patch and lustre_manpages.patch Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 629cb8f46b57c7ae9c7c43b2505fb153d680777f
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 10 10:54:27 2010 +0100

Merge fix-lustre-manpage.patch and lustre_manpages.patch
Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/fix-lustre-manpage.patch 
b/debian/patches/fix-lustre-manpage.patch
deleted file mode 100755
index fe7d491..000
--- a/debian/patches/fix-lustre-manpage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-## fix-lustre-manpage.dpatch by Patrick Winnertz win...@debian.org
-## DP: fix some errors in the lustre manpage
-
-diff -urNad lustre-1.6.5.1~/lustre/doc/lctl.8 lustre-1.6.5.1/lustre/doc/lctl.8
 lustre-1.6.5.1~/lustre/doc/lctl.8  2007-09-27 07:09:22.0 +0200
-+++ lustre-1.6.5.1/lustre/doc/lctl.8   2008-09-12 16:09:43.0 +0200
-@@ -36,7 +36,7 @@
- command, type 
- .B help 
- .I command
--.  Command completion is activated with the TAB key, and command history is 
available via the up- and down-arrow keys. 
-+Command completion is activated with the TAB key, and command history is 
available via the up- and down-arrow keys. 
- 
- For non-interactive use, one uses the second invocation, which runs command 
after connecting to the device. 
- 
-diff -urNad lustre-1.6.5.1~/lustre/doc/lustre.7 
lustre-1.6.5.1/lustre/doc/lustre.7
 lustre-1.6.5.1~/lustre/doc/lustre.72008-09-12 16:09:32.0 
+0200
-+++ lustre-1.6.5.1/lustre/doc/lustre.7 2008-09-12 16:09:33.0 +0200
-@@ -2,9 +2,9 @@
- .\ Copyright 2006 by Cluster FileSystems.  All Rights Reserved.
- .\ This file may be copied under the terms of the GNU Public License.
- .\
--.TH Lustre 7 2006 Jun 15 Lustre A high-performance cluster file system
-+.TH Lustre 7
- .SH NAME
--Lustre
-+Lustre - a high-performance cluster file system
- .SH SYNOPSIS
- A high-performance file system designed for clusters.
- .SH DESCRIPTION

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

[Pkg-lustre-svn-commit] updated: [5758022] Install all new manpages into the packages

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 57580224615315e9e607452bbb248c27f553c9fe
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 10 11:40:39 2010 +0100

Install all new manpages into the packages

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/liblustre.manpages b/debian/liblustre.manpages
new file mode 100644
index 000..1f7dba0
--- /dev/null
+++ b/debian/liblustre.manpages
@@ -0,0 +1 @@
+lustre/doc/liblustreapi.7
diff --git a/debian/lustre-utils.manpages b/debian/lustre-utils.manpages
index 228c3f4..be24d31 100644
--- a/debian/lustre-utils.manpages
+++ b/debian/lustre-utils.manpages
@@ -1,6 +1,24 @@
 lustre/doc/lustre.7
 lustre/doc/mkfs.lustre.8
 lustre/doc/lctl.8
-debian/lfs.1
+lustre/doc/lfs.1
 lustre/doc/mount.lustre.8
 lustre/doc/tunefs.lustre.8
+lustre/doc/llapi_file_create.3
+lustre/doc/llbackup.8
+lustre/doc/llstat.8
+lustre/doc/mount.lustre.8
+lustre/doc/tunefs.lustre.8
+lustre/doc/llapi_file_get_stripe.3
+lustre/doc/llobdstat.8
+lustre/doc/llverdev.8
+lustre/doc/plot-llstat.8
+lustre/doc/l_getgroups.8
+lustre/doc/llapi_file_open.3
+lustre/doc/llog_reader.8
+lustre/doc/lshowmount.8
+lustre/doc/routerstat.8
+lustre/doc/llapi_quotactl.3
+lustre/doc/ll_recover_lost_found_objs.8  
+lustre/doc/lst.8
+

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

[Pkg-lustre-svn-commit] updated: [2e982eb] Removed unused overrides

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 2e982eb8a90ab10b9b39e86aa1877264658309ea
Author: Patrick Winnertz win...@debian.org
Date:   Fri Dec 10 12:25:38 2010 +0100

Removed unused overrides

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/lustre-utils.lintian-overrides 
b/debian/lustre-utils.lintian-overrides
index 5b50677..e889fbc 100644
--- a/debian/lustre-utils.lintian-overrides
+++ b/debian/lustre-utils.lintian-overrides
@@ -1,7 +1,6 @@
 #Overrides warnings about manpages, you've to read nevertheless the docu
 lustre-utils: binary-without-manpage usr/sbin/debugctl
 lustre-utils: binary-without-manpage usr/bin/ior-survey   
-lustre-utils: binary-without-manpage usr/sbin/l_getgroups 
 lustre-utils: binary-without-manpage usr/sbin/lc_cluman   
 lustre-utils: binary-without-manpage usr/sbin/lc_hb   
 lustre-utils: binary-without-manpage usr/sbin/lc_lvm  
@@ -11,17 +10,10 @@ lustre-utils: binary-without-manpage usr/sbin/lc_net
 lustre-utils: binary-without-manpage usr/sbin/lc_servip   
 lustre-utils: binary-without-manpage usr/bin/libecho  
 lustre-utils: binary-without-manpage usr/sbin/ll_decode_filter_fid
-lustre-utils: binary-without-manpage usr/sbin/ll_recover_lost_found_objs  
-lustre-utils: binary-without-manpage usr/bin/llobdstat
-lustre-utils: binary-without-manpage usr/sbin/llog_reader 
-lustre-utils: binary-without-manpage usr/bin/llstat   
-lustre-utils: binary-without-manpage usr/sbin/llverdev
 lustre-utils: binary-without-manpage usr/sbin/llverfs 
 lustre-utils: binary-without-manpage usr/sbin/loadgen 
 lustre-utils: binary-without-manpage usr/sbin/lr_reader   
 lustre-utils: binary-without-manpage usr/sbin/lrun
-lustre-utils: binary-without-manpage usr/sbin/lshowmount  
-lustre-utils: binary-without-manpage usr/sbin/lst 
 lustre-utils: binary-without-manpage usr/sbin/lstclient   
 lustre-utils: binary-without-manpage usr/sbin/ltrack_stats
 lustre-utils: binary-without-manpage usr/sbin/lustre_config   
@@ -35,12 +27,10 @@ lustre-utils: binary-without-manpage usr/bin/munlink
 lustre-utils: binary-without-manpage usr/bin/obdfilter-survey 
 lustre-utils: binary-without-manpage usr/bin/ost-survey   
 lustre-utils: binary-without-manpage usr/bin/parse-ior
-lustre-utils: binary-without-manpage usr/bin/plot-llstat
 lustre-utils: binary-without-manpage usr/bin/plot-obdfilter
 lustre-utils: binary-without-manpage usr/bin/plot-ost
 lustre-utils: binary-without-manpage usr/bin/plot-sgpdd
 lustre-utils: binary-without-manpage usr/sbin/ptlctl
-lustre-utils: binary-without-manpage usr/sbin/routerstat
 lustre-utils: binary-without-manpage usr/bin/sgpdd-survey
 lustre-utils: binary-without-manpage usr/sbin/wirecheck
 lustre-utils: binary-without-manpage usr/sbin/wiretest

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

[Pkg-lustre-svn-commit] updated: [4d5e398] some more lintian warnings

[Patrick Winnertz]

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 000..947
--- /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..000
--- 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

[Pkg-lustre-svn-commit] updated: [c0df0f5] Add changelog entry for lenny backport

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit c0df0f59a81149154ec357a5157df8ec4cbe3e57
Author: Patrick Winnertz win...@debian.org
Date:   Fri Nov 12 10:56:34 2010 +0100

Add changelog entry for lenny backport

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 5000da7..c7c820c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lustre (1.8.4-1) unstable; urgency=low
+lustre (1.8.4-0.credativ.lenny.2) unstable; urgency=low
 
   * [f4955cc] Remove .gitignore file to prevent conflicts with lustre-
 git

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

[Pkg-lustre-svn-commit] updated: [54a3db5] Merge commit 'upstream/1.8.5+dfsg'

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 54a3db5e78153119fc7dbe2ee0b2e7086dfe0865
Merge: c0df0f59a81149154ec357a5157df8ec4cbe3e57 
b396782a19e8fbbe097382b9bb68fa0e3234b1d5
Author: Patrick Winnertz win...@debian.org
Date:   Tue Dec 7 12:52:38 2010 +0100

Merge commit 'upstream/1.8.5+dfsg'


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

[Pkg-lustre-svn-commit] updated: [9b9cb17] Created changelog entry for 1.8.5

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 9b9cb17baabce3e7950b38a9380d82427fc70ad9
Author: Patrick Winnertz win...@debian.org
Date:   Tue Dec 7 12:56:18 2010 +0100

Created changelog entry for 1.8.5

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index c7c820c..0a2c73b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lustre (1.8.5+dpsg-1~1.gbp54a3db) UNRELEASED; urgency=low
+
+  ** SNAPSHOT build @54a3db5e78153119fc7dbe2ee0b2e7086dfe0865 **
+
+  * [b396782] Imported Upstream version 1.8.5+dfsg
+
+ -- Patrick Winnertz win...@debian.org  Tue, 07 Dec 2010 12:55:30 +0100
+
 lustre (1.8.4-0.credativ.lenny.2) unstable; urgency=low
 
   * [f4955cc] Remove .gitignore file to prevent conflicts with lustre-

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

[Pkg-lustre-svn-commit] updated: [8cb18c9] Revert Add changelog entry for lenny backport

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 8cb18c96c1dfc309a86da81bfebeb375b54afa63
Author: Patrick Winnertz win...@debian.org
Date:   Tue Dec 7 12:57:09 2010 +0100

Revert Add changelog entry for lenny backport

This reverts commit c0df0f59a81149154ec357a5157df8ec4cbe3e57.

Conflicts:

debian/changelog

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 0a2c73b..0677ac4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ lustre (1.8.5+dpsg-1~1.gbp54a3db) UNRELEASED; urgency=low
 
  -- Patrick Winnertz win...@debian.org  Tue, 07 Dec 2010 12:55:30 +0100
 
-lustre (1.8.4-0.credativ.lenny.2) unstable; urgency=low
+lustre (1.8.4-1) unstable; urgency=low
 
   * [f4955cc] Remove .gitignore file to prevent conflicts with lustre-
 git

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

[Pkg-lustre-svn-commit] updated: [88ecff0] typo

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 88ecff04ba165e266a5b0a0b0ebb56f727514b10
Author: Patrick Winnertz win...@debian.org
Date:   Tue Dec 7 13:01:55 2010 +0100

typo

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 0677ac4..abb618d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lustre (1.8.5+dpsg-1~1.gbp54a3db) UNRELEASED; urgency=low
+lustre (1.8.5+dfsg-1~1.gbp54a3db) UNRELEASED; urgency=low
 
   ** SNAPSHOT build @54a3db5e78153119fc7dbe2ee0b2e7086dfe0865 **
 

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

[Pkg-lustre-svn-commit] created: [b396782] Imported Upstream version 1.8.5+dfsg

[Patrick Winnertz]

The annotated tag, upstream/1.8.5+dfsg has been created
at  0764a3726c981dc8ad4e499b09201ae14dc925b1 (tag)
   tagging  b396782a19e8fbbe097382b9bb68fa0e3234b1d5 (commit)
  replaces  upstream/1.8.4
 tagged by  Patrick Winnertz
on  Tue Dec 7 12:52:37 2010 +0100

- Shortlog 
Upstream version 1.8.5+dfsg

Patrick Winnertz (1):
  Imported Upstream version 1.8.5+dfsg

---

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

[Pkg-lustre-svn-commit] updated: [f5c0e63] Add autogen.sh again

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit f5c0e6322a87f18fbcc83504d53b2942c2e5144c
Author: Patrick Winnertz win...@debian.org
Date:   Thu Aug 19 10:28:59 2010 +0200

Add autogen.sh again

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/00list b/debian/patches/00list
index 732386e..cf9145e 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,7 +4,7 @@ page-size-undef-fixes.dpatch
 posix_acl.dpatch
 ldiskfs-detect-2.6.20-2.6.22.dpatch
 no_default_debugging.dpatch
-#autogen.sh.dpatch
+autogen.sh.dpatch
 no-darwin.dpatch
 libsysio.dpatch
 bug12769-ql-fix.dpatch

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

[Pkg-lustre-svn-commit] updated: [0128561] temp commit for lenny build

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 0128561236f0ee62d4cf9c3fd12f8f9d3d8778d8
Author: Patrick Winnertz win...@debian.org
Date:   Thu Aug 19 10:29:13 2010 +0200

temp commit  for lenny build

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 5000da7..1f0140b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lustre (1.8.4-1) unstable; urgency=low
+lustre (1.8.4-0.credativ.lenny.1) unstable; urgency=low
 
   * [f4955cc] Remove .gitignore file to prevent conflicts with lustre-
 git

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

[Pkg-lustre-svn-commit] updated: [61d1c3f] Build-depend on libdb-dev (= 4.7) instead of libdb4.6-dev (Closes: #548483)

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 61d1c3f2cb1dfc76d9cadb61ae1d9d67a5e24227
Author: Patrick Winnertz win...@debian.org
Date:   Wed Sep 8 10:47:38 2010 +0200

Build-depend on libdb-dev (= 4.7) instead of libdb4.6-dev (Closes: #548483)

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index 1bdcece..8e70719 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 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
-Build-Depends: texi2html (= 1.76), gettext, texinfo, dc, pkg-config, 
dietlibc-dev, libsepol1-dev, libdevmapper-dev, libselinux1-dev, debhelper (= 
5.0.42), lustre-dev, libdb4.6-dev, quilt
+Build-Depends: texi2html (= 1.76), gettext, texinfo, dc, pkg-config, 
dietlibc-dev, libsepol1-dev, libdevmapper-dev, libselinux1-dev, debhelper (= 
5.0.42), lustre-dev, libdb-dev (= 4,7), quilt
 Standards-Version: 3.8.2
 Homepage: http://www.lustre.org
 

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [8d344bf] Fix typo in package description (Closes: #586561)

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 8d344bf1d28733aee9b8d276938da4ea1033a6bc
Author: Patrick Winnertz win...@debian.org
Date:   Wed Sep 8 10:48:16 2010 +0200

Fix typo in package description (Closes: #586561)

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index 8e70719..055c422 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Architecture: i386 amd64 ia64
 Description: statically-linked lustre version of the ext2 filesystem checker
  This binary is necessary in order to check the lustre filesystem on OST and
  MGS nodes. This binary is linked statically in order to do not conflict with
- the regular e2fsck package, therefore it will consume much more space thant
+ the regular e2fsck package, therefore it will consume much more space than
  it's dynamic linked counterpart.  
 
 

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [105ff32] Debian changelog for 1.41.10-2 Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 105ff327c1c893221758c3414512de12fe36f633
Author: Patrick Winnertz win...@debian.org
Date:   Wed Sep 8 10:52:22 2010 +0200

Debian changelog for 1.41.10-2
Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 58d9d71..13e5efd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-ldiskfsprogs (1.41.10-0.credativ.lenny.1) unstable; urgency=low
+ldiskfsprogs (1.41.10-2) unstable; urgency=low
+
+  * Add a new package called ldiskfsprogs with utilties
+  * Build-depend on libdb-dev (= 4.7) instead of libdb4.6-dev (Closes:
+#548483)
+  * Fix typo in package description (Closes: #586561)
+
+ -- Patrick Winnertz win...@debian.org  Wed, 08 Sep 2010 10:51:20 +0200
+
+ldiskfsprogs (1.41.10-1) unstable; urgency=low
 
   * Imported Upstream version 1.41.10
   * Imported new patches for 1.41.10

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [c5271c9] typo in debian/control

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit c5271c91974b8b855733ecd32c52d1553f7b53d9
Author: Patrick Winnertz win...@debian.org
Date:   Wed Sep 8 10:56:13 2010 +0200

typo in debian/control

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 13e5efd..72d1238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 ldiskfsprogs (1.41.10-2) unstable; urgency=low
 
-  * Add a new package called ldiskfsprogs with utilties
   * Build-depend on libdb-dev (= 4.7) instead of libdb4.6-dev (Closes:
 #548483)
   * Fix typo in package description (Closes: #586561)
diff --git a/debian/control b/debian/control
index 055c422..e20bbde 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 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
-Build-Depends: texi2html (= 1.76), gettext, texinfo, dc, pkg-config, 
dietlibc-dev, libsepol1-dev, libdevmapper-dev, libselinux1-dev, debhelper (= 
5.0.42), lustre-dev, libdb-dev (= 4,7), quilt
+Build-Depends: texi2html (= 1.76), gettext, texinfo, dc, pkg-config, 
dietlibc-dev, libsepol1-dev, libdevmapper-dev, libselinux1-dev, debhelper (= 
5.0.42), lustre-dev, libdb-dev (= 4.7), quilt
 Standards-Version: 3.8.2
 Homepage: http://www.lustre.org
 
@@ -23,12 +23,3 @@ Architecture: i386 amd64 ia64
 Description: statically linked version of the lustre filesystem checker
  This binary is necessary to check the complete lustre filesystem for errors.
  You only need that package on lustre clients.
-
-Package: ldiskfsprogs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: lfsck | ldiskfsck
-Architecture: i386 amd64 ia64
-Description: statically linked version of the tools for ldiskfsprogs
- lustre patched versions of dumpe2fs, tune2fs and mke2fs which are statically
- linked.
- This package is usefull on both clients and servers.

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] created: [69badcb] remove helping stuff from lfsck.install

[Patrick Winnertz]

The annotated tag, debian/1.41.10-2 has been created
at  82d2441abea40f93339d0d23d54d2b3141c81926 (tag)
   tagging  69badcba8687e48eabff7d7eefeabf87aaa1e636 (commit)
  replaces  debian/1.41.10-1
 tagged by  Patrick Winnertz
on  Wed Sep 8 13:02:23 2010 +0200

- Shortlog 
Debian release 1.41.10-2

Patrick Winnertz (7):
  temp commit for build
  Add a new package called ldiskfsprogs with utilties
  Build-depend on libdb-dev (= 4.7) instead of libdb4.6-dev (Closes: 
#548483)
  Fix typo in package description (Closes: #586561)
  Debian changelog for 1.41.10-2
  typo in debian/control
  remove helping stuff from lfsck.install

---

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [8bef54d] Update debian/changelog

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 8bef54d3049d9171a8f64c2042f90b0e2606f009
Author: Patrick Winnertz win...@debian.org
Date:   Fri Aug 13 13:12:25 2010 +0200

Update debian/changelog

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 84521c6..4edbeed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
-lustre (1.8.4~git20100804-1~1.gbp683b69) UNRELEASED; urgency=low
-
-  ** SNAPSHOT build @683b69cbd7e24f608a628d9e9e523f726ac3ee4b **
+lustre (1.8.4~git20100804-1) unstable; urgency=low
 
   * [f4955cc] Remove .gitignore file to prevent conflicts with lustre-
 git
   * [bff2c31] Imported Upstream version 1.8.4~git20100804
-
- -- Patrick Winnertz win...@debian.org  Wed, 04 Aug 2010 11:12:13 +0200
+  * [5b0ed6a] Add changelog entry for 1.8.4
+  * [df980ba] Remove autogen.sh patch
+  * [83b26d5] Remove manpage fix
+  * [75375cb] Remove typecasts patch as it doesn't apply
+  * [94ce62e] Remove another patch which doesn't apply
+  * [d0dc2eb] Add a small patch to prevent version_tag.pl from failing
+  * [72e426e] Remove -Werror from gcc arguments
+
+ -- Patrick Winnertz win...@debian.org  Fri, 13 Aug 2010 13:09:28 +0200
 
 lustre (1.8.3-4) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] updated: [00e817c] Update changelog

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 00e817c5f5df2589f16177e255b4125b55fc2ee8
Author: Patrick Winnertz win...@debian.org
Date:   Thu Aug 19 09:03:21 2010 +0200

Update changelog

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 4edbeed..a39bc72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lustre (1.8.4~git20100804-1) unstable; urgency=low
+lustre (1.8.4-1) unstable; urgency=low
 
   * [f4955cc] Remove .gitignore file to prevent conflicts with lustre-
 git
@@ -11,7 +11,7 @@ lustre (1.8.4~git20100804-1) unstable; urgency=low
   * [d0dc2eb] Add a small patch to prevent version_tag.pl from failing
   * [72e426e] Remove -Werror from gcc arguments
 
- -- Patrick Winnertz win...@debian.org  Fri, 13 Aug 2010 13:09:28 +0200
+ -- Patrick Winnertz win...@debian.org  Thu, 19 Aug 2010 09:02:41 +0200
 
 lustre (1.8.3-4) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] created: [9cf2a66] Imported Upstream version 1.8.4

[Patrick Winnertz]

The annotated tag, upstream/1.8.4 has been created
at  d3ebcc9572cfeb1d5cea7f3877585f3bcd2ead66 (tag)
   tagging  9cf2a661a75de4a3e35c182fbbd28aac62a56915 (commit)
  replaces  upstream/1.8.4.git20100804
 tagged by  Patrick Winnertz
on  Thu Aug 19 09:40:27 2010 +0200

- Shortlog 
Upstream version 1.8.4

Patrick Winnertz (1):
  Imported Upstream version 1.8.4

---

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

[Pkg-lustre-svn-commit] updated: [d320528] Merge commit 'upstream/1.41.10'

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit d3205287e55eac9492ac6977339c10b90f338e66
Merge: ee3e614492944caa94c5b4e2f3cc266db247e8de 
b418099b94251b23095dfb32ba4a055b8edf1a12
Author: Patrick Winnertz win...@debian.org
Date:   Wed May 12 09:55:34 2010 +0200

Merge commit 'upstream/1.41.10'


-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [e1008d3] Updated debian/changelog

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit e1008d38665c03a40d149c4fade1e2ce49d98eab
Author: Patrick Winnertz win...@debian.org
Date:   Wed May 12 10:04:10 2010 +0200

Updated debian/changelog

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 42c580b..cb22bb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ldiskfsprogs (1.41.10-1~1.gbpf4da05) UNRELEASED; urgency=low
+
+  ** SNAPSHOT build @f4da0533f62f6fd6dc39e81e6e11bfb43030e269 **
+
+  * Imported Upstream version 1.41.10
+  * Imported new patches for 1.41.10
+  * Removed for a first try the gitignore file
+
+ -- Patrick Winnertz win...@debian.org  Wed, 12 May 2010 10:03:35 +0200
+
 ldiskfsprogs (1.41.6-1) unstable; urgency=low
 
   * New Upstream Version
@@ -8,7 +18,7 @@ ldiskfsprogs (1.41.6-1) unstable; urgency=low
   * Bump standards-version to 3.8.2 - no further changes needed
   * Added versioned dependency on debhelper
 
- -- Patrick Winnertz win...@debian.org  Thu, 06 Aug 2009 10:38:46 +0200
+ -- Patrick Winnertz win...@debian.org  Wed, 12 May 2010 10:03:19 +0200
 
 ldiskfsprogs (1.40.11-2) unstable; urgency=low
 

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [122b981] temp commit for build Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 122b981cd143ff0afbcf28cc642cf48f295805a0
Author: Patrick Winnertz win...@debian.org
Date:   Thu May 20 11:53:29 2010 +0200

temp commit for build
Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 02ec7b8..58d9d71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ldiskfsprogs (1.41.10-1) unstable; urgency=low
+ldiskfsprogs (1.41.10-0.credativ.lenny.1) unstable; urgency=low
 
   * Imported Upstream version 1.41.10
   * Imported new patches for 1.41.10

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] updated: [bda873e] Add a new package called ldiskfsprogs with utilties

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit bda873e33d080774252fa0cdf57e650e26fc6c6c
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 2 14:52:58 2010 +0200

Add a new package called ldiskfsprogs with utilties

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index ddbf93d..1bdcece 100644
--- a/debian/control
+++ b/debian/control
@@ -24,3 +24,11 @@ Description: statically linked version of the lustre 
filesystem checker
  This binary is necessary to check the complete lustre filesystem for errors.
  You only need that package on lustre clients.
 
+Package: ldiskfsprogs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: lfsck | ldiskfsck
+Architecture: i386 amd64 ia64
+Description: statically linked version of the tools for ldiskfsprogs
+ lustre patched versions of dumpe2fs, tune2fs and mke2fs which are statically
+ linked.
+ This package is usefull on both clients and servers.
diff --git a/debian/lfsck.install b/debian/lfsck.install
index d609358..c91009d 100644
--- a/debian/lfsck.install
+++ b/debian/lfsck.install
@@ -1,2 +1,3 @@
 usr/sbin/lfsck.static
 usr/share/man/man8/lfsck.static.8
+usr/nonexistent/test

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] created: [ff128e7] Clean up ./debian and fix some lintian warnings

[Patrick Winnertz]

The annotated tag, debian/1.41.10-1 has been created
at  7ce122b39756c71723f8eec4aa891e1814a560be (tag)
   tagging  ff128e7d518ed4d14b1c71c7b947b18a90d3654b (commit)
  replaces  debian/1.41.6-1
 tagged by  Patrick Winnertz
on  Thu May 20 11:04:03 2010 +0200

- Shortlog 
Debian release 1.41.10-1

Patrick Winnertz (11):
  Imported Upstream version 1.41.10
  Merge commit 'upstream/1.41.10'
  Imported new patches for 1.41.10
  Removed for a first try the gitignore file
  Updated debian/changelog
  Removed patches with binary stuff inside
  Some more changes on the series file
  configure option --with-ccopts doesn't exist anymore.. switching to CFLAGS
  link statically
  Prepare for upload
  Clean up ./debian and fix some lintian warnings

---

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] created: [b418099] Imported Upstream version 1.41.10

[Patrick Winnertz]

The annotated tag, upstream/1.41.10 has been created
at  6c8738ece4726ea683690aa13712d9eddbf4d114 (tag)
   tagging  b418099b94251b23095dfb32ba4a055b8edf1a12 (commit)
  replaces  upstream/1.41.6
 tagged by  Patrick Winnertz
on  Wed May 12 09:55:34 2010 +0200

- Shortlog 
Upstream version 1.41.10

Patrick Winnertz (1):
  Imported Upstream version 1.41.10

---

-- 
Repository for maintaining lidskfsprogs

___
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

[Pkg-lustre-svn-commit] created: [bff2c31] Imported Upstream version 1.8.4~git20100804

[Patrick Winnertz]

The annotated tag, upstream/1.8.4.git20100804 has been created
at  322df1c38503ca9538eddcd98ae3c05b64f975b9 (tag)
   tagging  bff2c31139d54d31a8aff511427ab11ee7b4c4c1 (commit)
  replaces  upstream/1.8.3
 tagged by  Patrick Winnertz
on  Wed Aug 4 11:11:01 2010 +0200

- Shortlog 
Upstream version 1.8.4~git20100804

Patrick Winnertz (1):
  Imported Upstream version 1.8.4~git20100804

---

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

[Pkg-lustre-svn-commit] updated: [9c346e3] commit changelog for a -4 upload to fix two more bugs

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 9c346e3ad7b4ab622fdd47fdbdd515d34aa65834
Author: Patrick Winnertz win...@debian.org
Date:   Thu Jul 29 11:28:21 2010 +0200

commit changelog for a -4 upload to fix two more bugs

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 85976c5..cda98ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,10 @@
-lustre (1.8.3-4~1.gbp5dad88) UNRELEASED; urgency=low
-
-  ** SNAPSHOT build @5dad88ee42612bdbb7e339a981f1392cfb531638 **
+lustre (1.8.3-4) unstable; urgency=low
 
   * [98ac0eb] Fix a small typo in the control file (Closes: #587201)
   * [5dad88e] Using /bin/bash as interpreter for lnet-selftest 
 (Closes: #581121)
 
- -- Patrick Winnertz win...@debian.org  Wed, 28 Jul 2010 14:30:06 +0200
+ -- Patrick Winnertz win...@debian.org  Thu, 29 Jul 2010 11:27:56 +0200
 
 lustre (1.8.3-3) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] updated: [75375cb] Remove typecasts patch as it doesn't apply

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 75375cb07d0d74f0620683595c3b570dd0731501
Author: Patrick Winnertz win...@debian.org
Date:   Wed Aug 4 11:33:37 2010 +0200

Remove typecasts patch as it doesn't apply

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/00list b/debian/patches/00list
index 7d41461..773eefa 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -22,7 +22,7 @@ fix-symlink-attack.dpatch
 use_bash_instead_of_sh.dpatch
 #hotfixes for 1.8.2:
 fix-oot-builds.dpatch
-fix_various_typecasts.dpatch
+#fix_various_typecasts.dpatch
 no-strict-aliasing.dpatch
 fix_bashisms_for_dash.dpatch
 fix_dentry_conf_test.dpatch

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

[Pkg-lustre-svn-commit] updated: [94ce62e] Remove another patch which doesn't apply

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 94ce62ef3ce39ec1ae282b09ca15f26ba4b0425c
Author: Patrick Winnertz win...@debian.org
Date:   Wed Aug 4 11:38:16 2010 +0200

Remove another patch which doesn't apply

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/00list b/debian/patches/00list
index 773eefa..f148c5c 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -23,6 +23,6 @@ use_bash_instead_of_sh.dpatch
 #hotfixes for 1.8.2:
 fix-oot-builds.dpatch
 #fix_various_typecasts.dpatch
-no-strict-aliasing.dpatch
+#no-strict-aliasing.dpatch
 fix_bashisms_for_dash.dpatch
 fix_dentry_conf_test.dpatch

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

[Pkg-lustre-svn-commit] updated: [d0dc2eb] Add a small patch to prevent version_tag.pl from failing

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit d0dc2ebb7057c874eec514795b06570fe437f189
Author: Patrick Winnertz win...@debian.org
Date:   Wed Aug 4 12:26:10 2010 +0200

Add a small patch to prevent version_tag.pl from failing

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/00list b/debian/patches/00list
index f148c5c..441370f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -20,6 +20,7 @@ bug13852-quota_includes.dpatch
 enable-quota.dpatch
 fix-symlink-attack.dpatch
 use_bash_instead_of_sh.dpatch
+fix_version_tag-pl.dpatch
 #hotfixes for 1.8.2:
 fix-oot-builds.dpatch
 #fix_various_typecasts.dpatch
diff --git a/debian/patches/fix_version_tag-pl.dpatch 
b/debian/patches/fix_version_tag-pl.dpatch
new file mode 100755
index 000..b0548fa
--- /dev/null
+++ b/debian/patches/fix_version_tag-pl.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_version_tag-pl.dpatch by Patrick Winnertz win...@debian.org
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+...@dpatch@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl
+--- lustre~/lustre/scripts/version_tag.pl  2010-01-11 04:29:50.0 
+0100
 lustre/lustre/scripts/version_tag.pl   2010-08-04 12:25:25.942494281 
+0200
+@@ -125,8 +125,8 @@
+ $last_mtime = time();
+ } else {
+ my $tree_status = new IO::File;
+-if (!$tree_status-open(tree_status)) {
+-die unable to open the tree_status file: $!\n;
++if (!$tree_status-open(configure)) {
++die unable to open the configure file: $!\n;
+ }
+ my $line;
+ while (defined($line = $tree_status)) {

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

[Pkg-lustre-svn-commit] updated: [72e426e] Remove -Werror from gcc arguments

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 72e426e2b40dbb698cf1c4e5b8d7dcd374c7d751
Author: Patrick Winnertz win...@debian.org
Date:   Wed Aug 4 12:58:02 2010 +0200

Remove -Werror from gcc arguments

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/00list b/debian/patches/00list
index 441370f..732386e 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -24,6 +24,6 @@ fix_version_tag-pl.dpatch
 #hotfixes for 1.8.2:
 fix-oot-builds.dpatch
 #fix_various_typecasts.dpatch
-#no-strict-aliasing.dpatch
+no-strict-aliasing.dpatch
 fix_bashisms_for_dash.dpatch
 fix_dentry_conf_test.dpatch
diff --git a/debian/patches/no-strict-aliasing.dpatch 
b/debian/patches/no-strict-aliasing.dpatch
index bd62656..e82103c 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -5,188 +5,10 @@
 ## DP: Build lustre wit -fno-strict-aliasing as it otherwise fails to compile 
with gcc-4.4
 
 @DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/aclocal.m4 lustre/aclocal.m4
 lustre~/aclocal.m4 2010-03-11 13:05:55.0 +0100
-+++ lustre/aclocal.m4  2010-04-21 11:07:29.552195225 +0200
-@@ -1681,7 +1681,7 @@
- AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
- [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of 
super_block])
- tmp_flags=$EXTRA_KCFLAGS
--EXTRA_KCFLAGS=-Werror
-+EXTRA_KCFLAGS=-Werror -fno-strict-aliasing
- LB_LINUX_TRY_COMPILE([
-   #include linux/fs.h
- 
-@@ -1746,7 +1746,7 @@
- AC_DEFUN([LC_VFS_READDIR_U64_INO],
- [AC_MSG_CHECKING([check vfs_readdir need 64bit inode number])
- tmp_flags=$EXTRA_KCFLAGS
--EXTRA_KCFLAGS=-Werror
-+EXTRA_KCFLAGS=-Werror -fno-strict-aliasing
- LB_LINUX_TRY_COMPILE([
- #include linux/fs.h
-   int fillonedir(void * __buf, const char * name, int namlen, loff_t 
offset,
-@@ -2086,7 +2086,7 @@
- AC_DEFUN([LC_RW_TREE_LOCK],
- [AC_MSG_CHECKING([if kernel has tree_lock as rwlock])
- tmp_flags=$EXTRA_KCFLAGS
--EXTRA_KCFLAGS=-Werror
-+EXTRA_KCFLAGS=-Werror -fno-strict-aliasing
- LB_LINUX_TRY_COMPILE([
- #include linux/fs.h
- ],[
-@@ -2214,7 +2214,7 @@
- ],[
- AC_MSG_CHECKING([if kernel using gfp_t for shrinker second paramter])
- tmp_flags=$EXTRA_KCFLAGS
--EXTRA_KCFLAGS=-Werror
-+EXTRA_KCFLAGS=-Werror -fno-strict-aliasing
- LB_LINUX_TRY_COMPILE([
- #include linux/mm.h
- ],[
-@@ -2454,7 +2454,7 @@
- AC_DEFUN([LC_RW_TREE_LOCK],
- [AC_MSG_CHECKING([mapping-tree_lock is rw_lock])
- tmp_flags=$EXTRA_KCFLAGS
--EXTRA_KCFLAGS=-Werror
-+EXTRA_KCFLAGS=-Werror -fno-strict-aliasing
- LB_LINUX_TRY_COMPILE([
-   #include linux/fs.h
- ],[
-@@ -3245,9 +3245,9 @@
- AC_DEFUN([LC_CONFIGURE],
- [LC_CONFIG_OBD_BUFFER_SIZE
- 
--if test $target_cpu == i686 -o $target_cpu == x86_64; then
--CFLAGS=$CFLAGS -Werror
--fi
-+#if test $target_cpu == i686 -o $target_cpu == x86_64; then
-+#CFLAGS=$CFLAGS -Werror -fno-strict-aliasing
-+#fi
- 
- # include/liblustre.h
- AC_CHECK_HEADERS([asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h])
-@@ -5093,7 +5093,7 @@
- AC_DEFUN([LN_KERN__U64_LONG_LONG],
- [AC_MSG_CHECKING([kernel __u64 is long long type])
- tmp_flags=$EXTRA_KCFLAGS
--EXTRA_KCFLAGS=$EXTRA_KCFLAGS -Werror
-+EXTRA_KCFLAGS=$EXTRA_KCFLAGS -Werror -fno-strict-aliasing
- LB_LINUX_TRY_COMPILE([
-   #include linux/types.h
-   #include linux/stddef.h
-@@ -5116,7 +5116,7 @@
- AC_DEFUN([LN_USER__U64_LONG_LONG],
- [AC_MSG_CHECKING([userspace __u64 is long long type])
- tmp_flags=$CFLAGS
--CFLAGS=$CFLAGS -Werror
-+CFLAGS=$CFLAGS -Werror -fno-strict-aliasing
- AC_COMPILE_IFELSE([
-   #include linux/types.h
-   #include linux/stddef.h
-@@ -5141,7 +5141,7 @@
- AC_DEFUN([LN_SIZE_T_LONG],
- [AC_MSG_CHECKING([size_t is unsigned long type])
- tmp_flags=$CFLAGS
--CFLAGS=$CFLAGS -Werror
-+CFLAGS=$CFLAGS -Werror -fno-strict-aliasing
- AC_COMPILE_IFELSE([
-   #include linux/types.h
-   #include linux/stddef.h
-@@ -5165,7 +5165,7 @@
- AC_DEFUN([LN_SSIZE_T_LONG],
- [AC_MSG_CHECKING([ssize_t is signed long type])
- tmp_flags=$CFLAGS
--CFLAGS=$CFLAGS -Werror
-+CFLAGS=$CFLAGS -Werror -fno-strict-aliasing
- AC_COMPILE_IFELSE([
-   #include linux/types.h
-   #include linux/stddef.h
-@@ -5312,7 +5312,7 @@
- AC_DEFUN([LN_KMEM_CACHE],
- [AC_MSG_CHECKING([check kernel has struct kmem_cache])
- tmp_flags=$EXTRA_KCFLAGS
--EXTRA_KCFLAGS=-Werror
-+EXTRA_KCFLAGS=-Werror -fno-strict-aliasing
- LB_LINUX_TRY_COMPILE([
- #include linux/slab.h
- typedef struct kmem_cache cache_t;
-@@ -5356,7 +5356,7 @@
- [LB_CHECK_SYMBOL_EXPORT([dump_trace],
- [kernel/ksyms.c arch/${LINUX_ARCH%_64}/kernel/traps_64.c],[
-   tmp_flags=$EXTRA_KCFLAGS
--  EXTRA_KCFLAGS=-Werror
-+  EXTRA_KCFLAGS=-Werror -fno-strict-aliasing
-   AC_MSG_CHECKING([whether we can really use dump_trace

[Pkg-lustre-svn-commit] updated: [3f28bcb] Add a suggest to ofa-kernel-source and link against a ofa-kernel-headers dir if available

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 3f28bcba0b085b5b80a8417b55aaf95e80703e6e
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 23 11:29:57 2010 +0200

Add a suggest to ofa-kernel-source and link against a ofa-kernel-headers 
dir if available

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index e5a7ee7..7faaa93 100644
--- a/debian/control
+++ b/debian/control
@@ -31,6 +31,7 @@ Package: lustre-source
 Section: kernel
 Architecture: all
 Depends: module-assistant, bzip2, debhelper (= 5.0.0), libsnmp-dev, dpatch, 
${misc:Depends}
+Suggests: ofa-kernel-source
 Description: source for Lustre filesystem client kernel modules
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  It is maintained by Cluster Filesystems, Inc. and available from 
diff --git a/debian/rules b/debian/rules
index 2643734..1d08fdb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -263,10 +263,17 @@ kdist_config: prep-deb-files
#  Check build dependencies again, needs to be done since we just
# replaced the control file.
dpkg-checkbuilddeps
+   # check if a ofa-kernel-header package is installed for current kernel
+   # if yes, link against it:
+   if (test -d /usr/src/ofa-kernel-headers-$(KVERS)); then 
+   OFA_KERNEL=--with-o2ib=/usr/src/ofa-kernel-headers-$(KVERS)
+   else
+   OFA_KERNEL=
+   fi
# touch files to same date, to avoid auto*
find . -type f -exec touch -r COPYING {} \;
# Doesn't seem possible to only build modules...
-./configure --with-linux=$(KSRC) \
+./configure --with-linux=$(KSRC) $(OFA_KERNEL) \
--disable-quilt  \
--disable-dependency-tracking \
--disable-doc  \

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

[Pkg-lustre-svn-commit] updated: [932a83f] Add changelog entrys for snapshot build

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 932a83f7d7aaf0bba83446cce874daf5ae64107a
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 23 11:30:52 2010 +0200

Add changelog entrys for snapshot build

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 4084b1c..35edce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lustre (1.8.3-3~1.gbp3f28bc) UNRELEASED; urgency=low
+
+  ** SNAPSHOT build @3f28bcba0b085b5b80a8417b55aaf95e80703e6e **
+
+  * [015b186] Fixed typo in bug15587 patch: SECURUTY -- SECURITY
+  * [3f28bcb] Add a suggest to ofa-kernel-source and link against a ofa-
+kernel-headers dir if available
+
+ -- Patrick Winnertz win...@debian.org  Wed, 23 Jun 2010 11:30:34 +0200
+
 lustre (1.8.3-2) unstable; urgency=low
 
   * [df329e4] Add bug15587_security.capability_xattr.dpatch

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

[Pkg-lustre-svn-commit] updated: [26475f3] fix if condition Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 26475f37cd9b03df5bc42223631e0cc0241fb837
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 23 11:49:40 2010 +0200

fix if condition
Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/rules b/debian/rules
index 1d08fdb..023f4dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -265,7 +265,7 @@ kdist_config: prep-deb-files
dpkg-checkbuilddeps
# check if a ofa-kernel-header package is installed for current kernel
# if yes, link against it:
-   if (test -d /usr/src/ofa-kernel-headers-$(KVERS)); then 
+   if [ -d /usr/src/ofa-kernel-headers-$(KVERS) ]; then 
OFA_KERNEL=--with-o2ib=/usr/src/ofa-kernel-headers-$(KVERS)
else
OFA_KERNEL=

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

[Pkg-lustre-svn-commit] updated: [ecf2cf1] Some more error corrections for ofa-kernel

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit ecf2cf1ee75c8b897d6f933e8c3c5e9ccaa8bacc
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 23 12:48:57 2010 +0200

Some more error corrections for ofa-kernel

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/rules b/debian/rules
index 023f4dd..b1bd910 100755
--- a/debian/rules
+++ b/debian/rules
@@ -265,10 +265,10 @@ kdist_config: prep-deb-files
dpkg-checkbuilddeps
# check if a ofa-kernel-header package is installed for current kernel
# if yes, link against it:
-   if [ -d /usr/src/ofa-kernel-headers-$(KVERS) ]; then 
-   OFA_KERNEL=--with-o2ib=/usr/src/ofa-kernel-headers-$(KVERS)
-   else
-   OFA_KERNEL=
+   if [ -d /usr/src/ofa-kernel-headers-$(KVERS) ]; then \
+   OFA_KERNEL=--with-o2ib=/usr/src/ofa-kernel-headers-$(KVERS); \
+   else \
+   OFA_KERNEL=; \
fi
# touch files to same date, to avoid auto*
find . -type f -exec touch -r COPYING {} \;

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

[Pkg-lustre-svn-commit] updated: [1a3506d] third commit for testing new features

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 1a3506d1493bfacad67ec5519a98123658523444
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 23 12:49:22 2010 +0200

third commit for testing new features

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index ef64596..7fdb585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,16 @@
-lustre (1.8.3-3~2.gbp26475f) UNRELEASED; urgency=low
+lustre (1.8.3-3~3.gbpecf2cf) UNRELEASED; urgency=low
 
-  ** SNAPSHOT build @26475f37cd9b03df5bc42223631e0cc0241fb837 **
+  ** SNAPSHOT build @ecf2cf1ee75c8b897d6f933e8c3c5e9ccaa8bacc **
 
   * [015b186] Fixed typo in bug15587 patch: SECURUTY -- SECURITY
   * [3f28bcb] Add a suggest to ofa-kernel-source and link against a ofa-
 kernel-headers dir if available
   * [932a83f] Add changelog entrys for snapshot build
   * [26475f3] fix if condition
+  * [67ec64e] second snapshot build
+  * [ecf2cf1] Some more error corrections for ofa-kernel
 
- -- Patrick Winnertz win...@debian.org  Wed, 23 Jun 2010 11:50:03 +0200
+ -- Patrick Winnertz win...@debian.org  Wed, 23 Jun 2010 12:49:16 +0200
 
 lustre (1.8.3-2) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] updated: [9e6d9bf] commit changelog entry for -3 upload

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 9e6d9bf493a4e864e055b01c111015a6ead6ede6
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 23 13:24:35 2010 +0200

commit changelog entry for -3 upload

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 7fdb585..dc5ab92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,10 @@
-lustre (1.8.3-3~3.gbpecf2cf) UNRELEASED; urgency=low
-
-  ** SNAPSHOT build @ecf2cf1ee75c8b897d6f933e8c3c5e9ccaa8bacc **
+lustre (1.8.3-3) unstable; urgency=low
 
   * [015b186] Fixed typo in bug15587 patch: SECURUTY -- SECURITY
   * [3f28bcb] Add a suggest to ofa-kernel-source and link against a ofa-
 kernel-headers dir if available
-  * [932a83f] Add changelog entrys for snapshot build
-  * [26475f3] fix if condition
-  * [67ec64e] second snapshot build
-  * [ecf2cf1] Some more error corrections for ofa-kernel
 
- -- Patrick Winnertz win...@debian.org  Wed, 23 Jun 2010 12:49:16 +0200
+ -- Patrick Winnertz win...@debian.org  Wed, 23 Jun 2010 13:24:07 +0200
 
 lustre (1.8.3-2) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] updated: [b8a6f34] changelog for -3 upload ... finally

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit b8a6f34669ce2701badf83e8e51544f90634b916
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 23 15:38:08 2010 +0200

changelog for -3 upload ... finally

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 72f9d59..bd9d0e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lustre (1.8.3-0.credativ.lenny.4) unstable; urgency=low
+lustre (1.8.3-3) unstable; urgency=low
 
   * [015b186] Fixed typo in bug15587 patch: SECURUTY -- SECURITY
   * [3f28bcb] Add a suggest to ofa-kernel-source and link against a ofa-
@@ -6,7 +6,7 @@ lustre (1.8.3-0.credativ.lenny.4) unstable; urgency=low
   * [912f1ee] Add a ugly hack to recommend ofa-kernel-modules if they
 should exist (if lustre is linked against it)
 
- -- Patrick Winnertz win...@debian.org  Wed, 23 Jun 2010 13:55:39 +0200
+ -- Patrick Winnertz win...@debian.org  Wed, 23 Jun 2010 15:37:56 +0200
 
 lustre (1.8.3-2) unstable; urgency=low
 

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

[Pkg-lustre-svn-commit] updated: [015b186] Fixed typo in bug15587 patch: SECURUTY -- SECURITY

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 015b1862497a6c34dda61270ae3dbfed42e34d9a
Author: Patrick Winnertz win...@debian.org
Date:   Thu Jun 17 13:50:02 2010 +0200

Fixed typo in bug15587 patch: SECURUTY -- SECURITY

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/bug15587_security.capability_xattr.dpatch 
b/debian/patches/bug15587_security.capability_xattr.dpatch
index 212c991..3b1c5f7 100755
--- a/debian/patches/bug15587_security.capability_xattr.dpatch
+++ b/debian/patches/bug15587_security.capability_xattr.dpatch
@@ -14,7 +14,7 @@ index 8fbc7bf..819e7bb 100644
  RETURN(0);
  
 +/* b15587: ignore security.capability xattr for now */
-+if ((xattr_type == XATTR_SECURUTY_T 
++if ((xattr_type == XATTR_SECURITY_T 
 +strcmp(name, security.capability) == 0))
 +RETURN(0);
 +
@@ -26,7 +26,7 @@ index 8fbc7bf..819e7bb 100644
  RETURN(rc);
  
 +/* b15587: ignore security.capability xattr for now */
-+if ((xattr_type == XATTR_SECURUTY_T 
++if ((xattr_type == XATTR_SECURITY_T 
 +strcmp(name, security.capability) == 0))
 +RETURN(-ENODATA);
 +

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

[Pkg-lustre-svn-commit] updated: [02542fb] Updated changelog for 1.8.3 release

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 02542fb47b3ed68df0d3b2e65063af7137f1defd
Author: Patrick Winnertz win...@debian.org
Date:   Wed May 12 14:55:14 2010 +0200

Updated changelog for 1.8.3 release

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 8fdfaeb..80630c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ lustre (1.8.3-1) unstable; urgency=low
   * [4b619b5] Remove configure_error_on_unstable.dpatch as it seems to
 be unnecessary with 1.8.3
   * [0033ec8] New changelog for 1.8.3
+  * [29825e3] Fix bashism in configure script, which fails on unstable
 
- -- Patrick Winnertz win...@debian.org  Wed, 12 May 2010 13:52:42 +0200
+ -- Patrick Winnertz win...@debian.org  Wed, 12 May 2010 14:54:51 +0200
 
 lustre (1.8.2-1) unstable; urgency=low
 
diff --git a/debian/patches/fix_bashisms_for_dash.dpatch 
b/debian/patches/fix_bashisms_for_dash.dpatch
index 494944f..2e0b01c 100755
--- a/debian/patches/fix_bashisms_for_dash.dpatch
+++ b/debian/patches/fix_bashisms_for_dash.dpatch
@@ -44,7 +44,7 @@ index 6644fe5..a343eaf 100644
  
  AC_SUBST(BACKFS)
 -BACKFSU=${BACKFS/ext/EXT}
-+BACKFSU=${echo $BACKFS | sed -e 's#ext#EXT#'}
++BACKFSU=`echo $BACKFS | sed -e 's#ext#EXT#'`
  AC_SUBST(BACKFSU) # We need a Upper string
  
  AM_CONDITIONAL(USE_EXT4, test x$enable_ext4 = xyes)

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

[Pkg-lustre-svn-commit] updated: [f274fcb] Fix some lintian warnings/issues

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit f274fcbcbe881a633fe18ae4a6a1565063d5a12a
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 2 12:23:57 2010 +0200

Fix some lintian warnings/issues

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index 26e698a..e5a7ee7 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,6 @@ Description: Userspace utilities for the Lustre filesystem
  maintaining Lustre filesystems.
 
 Package: lustre-tests
-Section: admin
 Architecture: i386 powerpc amd64 ia64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Test suite for the Lustre filesystem
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index e2603a9..3716bca 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,4 +1,3 @@
 lustre source: ored-build-depends-on-obsolete-package build-depends: 
tetex-extra
 lustre source: more-than-one-patch-system
-lustre source: patch-system-but-direct-changes-in-diff 
ldiskfs/kernel_patches/series/ldiskfs-2.6.18-debian.series
 lustre source: quilt-build-dep-but-no-series-file

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

[Pkg-lustre-svn-commit] updated: [2fc7002] New debian release Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 2fc700259a3c3d100f0c392011151963a006937f
Author: Patrick Winnertz win...@debian.org
Date:   Wed Jun 2 12:24:47 2010 +0200

New debian release
Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 80630c7..4084b1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lustre (1.8.3-2) unstable; urgency=low
+
+  * [df329e4] Add bug15587_security.capability_xattr.dpatch
+  * [f274fcb] Fix some lintian warnings/issues
+
+ -- Patrick Winnertz win...@debian.org  Wed, 02 Jun 2010 12:24:23 +0200
+
 lustre (1.8.3-1) unstable; urgency=low
 
   * [93cd284] Imported Upstream version 1.8.3

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

[Pkg-lustre-svn-commit] created: [02542fb] Updated changelog for 1.8.3 release

[Patrick Winnertz]

The annotated tag, debian/1.8.3-1 has been created
at  45b872f50a53eebfc5a675a3cbee96d0b2846b75 (tag)
   tagging  02542fb47b3ed68df0d3b2e65063af7137f1defd (commit)
  replaces  debian/1.8.1-1
 tagged by  Patrick Winnertz
on  Wed May 12 17:51:03 2010 +0200

- Shortlog 
Debian release 1.8.3-1

Patrick Winnertz (66):
  Build lustre 1.8.1 also for unstable as it is stable enough to be 
included into
  temp commit for build on etch
  lustre 1.8.1 has support for 2.6.27 sles11 kernels .. backported some
  Backporting some patches to 2.6.26-vanilla kernel
  Add changelog entry
  Fixed some compiling issues on 2.6.26 about double symbols
  function v2_qbtos is missing, get it out of the sles11 stuff
  Needed to rediff one patch due to the sles11 quota patch
  Imported Upstream version 1.8.1.1
  Merge commit 'upstream/1.8.1.1'
  Revert etch changes
  Imported Upstream version 1.8.2
  Removed upstreams debian dir, we use our own one
  Merge commit 'upstream/1.8.2'
  Updated debian/changelog for 1.8.2
  Remove patches as they aren't needed with 1.8.2:
  The place of lc_common has changed, updated lustre-utils.install
  Add output of sh autogen.sh, as it currently (still) fails to run on 
unstable
  Update changelog
  Updated autogen-run.dpatch
  add -fno-strict-aliases
  various -Werror fixes
  don't patch debian/* files
  Updated Changelog
  Fix some bashisms by switching the interpreter from sh to bash (Closes: 
#530134)
  Updated changelog
  Fix some lintian warnings
  Change mode of dpatch file
  Prepare for release of 1.8.2-1
  First attempt to build 2.6.26er vanilla server with 1.8.2
  Rediffed no-strict-aliasing patch as we modified some files
  Updated autogen-run.dpatch
  Fix configure on debian unstable, which is broken since a autofoo update
  Updated no-strict-aliasing patch  removed autogen-run patch from 00list
  Fix configure patch for debian unstable
  Remove openIB Support, as it currently fails to build
  Fixed some lintian warnings concerning debian/control
  Fix two build failures of the kernel module on 2.6.26
  Fix several more typecasts while building 2.6.26
  Fix one configure target, which uses undefined HAVE_EXPORTFS_H variable
  Updated 00list
  fix mode of dpatch
  fix typecast: long unsigned int is needed here, not unsigned int
  Moved debian patch into the right direction for kernel build
  Removed old patches from debian/patches
  Updated lintian override files
  Added another fix for a compiler warning
  Don't patch no-darwin.dpatch in, it seems to be broken
  Updated no-strict-aliasing patch and removed non-needed stuff
  Updated darwin patch, as we need it to build correctly on linux
  temp commit for lenny build
  Fix an LBUG concerning open-unlinked directories
  Revert temp commit for lenny build
  New changelog for debian unstableOC
  Change mode to executable of new dpatches
  Updated -3 patch of the LBUG series as it doesn't apply
  No need for the -3 patch of this series
  Imported Upstream version 1.8.3
  Merge commit 'upstream/1.8.3'
  Remove LBUG patches as they are part of 1.8.3
  Updated no-darwin patch for 1.8.3
  Remove configure_error_on_unstable.dpatch as it seems to be unnecessary 
with 1.8.3
  New changelog for 1.8.3
  changelog for release of 1.8.3-1
  Fix bashism in configure script, which fails on unstable
  Updated changelog for 1.8.3 release

---

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

[Pkg-lustre-svn-commit] created: [2fc7002] New debian release Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The annotated tag, debian/1.8.3-2 has been created
at  7ef603658dcefd158a4cc03c03854b90bcc4427d (tag)
   tagging  2fc700259a3c3d100f0c392011151963a006937f (commit)
  replaces  debian/1.8.3-1
 tagged by  Patrick Winnertz
on  Wed Jun 2 12:32:09 2010 +0200

- Shortlog 
Debian release 1.8.3-2

Patrick Winnertz (3):
  Add bug15587_security.capability_xattr.dpatch
  Fix some lintian warnings/issues
  New debian release

---

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

[Pkg-lustre-svn-commit] created: [93cd284] Imported Upstream version 1.8.3

[Patrick Winnertz]

The annotated tag, upstream/1.8.3 has been created
at  38d8981fec7ed2d25ab36b557606c76448e55ab7 (tag)
   tagging  93cd28451d6d49aef4098c151921a4e490fcde4e (commit)
  replaces  upstream/1.8.1.1
 tagged by  Patrick Winnertz
on  Wed May 5 11:24:03 2010 +0200

- Shortlog 
Upstream version 1.8.3

Patrick Winnertz (3):
  Imported Upstream version 1.8.2
  Removed upstreams debian dir, we use our own one
  Imported Upstream version 1.8.3

---

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

[Pkg-lustre-svn-commit] updated: [56bbcf5] Merge commit 'upstream/1.8.3'

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 56bbcf56c9b12530bf0b4fc31d840bd40b5f75f4
Merge: 865c31f04ca848146976fa0b8697a3e9d6e18ad3 
93cd28451d6d49aef4098c151921a4e490fcde4e
Author: Patrick Winnertz win...@debian.org
Date:   Wed May 5 11:24:03 2010 +0200

Merge commit 'upstream/1.8.3'


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

[Pkg-lustre-svn-commit] updated: [4b619b5] Remove configure_error_on_unstable.dpatch as it seems to be unnecessary with 1.8.3

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 4b619b543ebfb4e10f71e1792484f0d465c1d67a
Author: Patrick Winnertz win...@debian.org
Date:   Wed May 5 12:05:15 2010 +0200

Remove configure_error_on_unstable.dpatch as it seems to be unnecessary 
with 1.8.3

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/00list b/debian/patches/00list
index 91f2174..eec7022 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -24,5 +24,4 @@ fix-oot-builds.dpatch
 fix_various_typecasts.dpatch
 no-strict-aliasing.dpatch
 fix_bashisms_for_dash.dpatch
-configure_error_on_unstable.dpatch
 fix_dentry_conf_test.dpatch

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

[Pkg-lustre-svn-commit] updated: [de8e711] temp commit for lenny build Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit de8e711c243e2c29a99f518424624051c4168039
Author: Patrick Winnertz win...@debian.org
Date:   Wed Apr 21 11:51:34 2010 +0200

temp commit for lenny build
Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/changelog b/debian/changelog
index 24ed48a..70cabf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lustre (1.8.2-1) unstable; urgency=low
+lustre (1.8.2-0.credativ.lenny.4) unstable; urgency=low
 
   * [3c3977b] Imported Upstream version 1.8.2
  - fixes FTBFS with conflicting types of preadv (Closes: #552824)

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

[Pkg-lustre-svn-commit] updated: [29e8c86] Fix an LBUG concerning open-unlinked directories

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 29e8c86e883e730590b5ac7f867410f65f4f317f
Author: Patrick Winnertz win...@debian.org
Date:   Wed Apr 28 14:13:50 2010 +0200

Fix an LBUG concerning open-unlinked directories

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/00list b/debian/patches/00list
index 91f2174..c6ebb7c 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -26,3 +26,6 @@ no-strict-aliasing.dpatch
 fix_bashisms_for_dash.dpatch
 configure_error_on_unstable.dpatch
 fix_dentry_conf_test.dpatch
+LBUG_open-unlinked_bug_22177-1.dpatch
+LBUG_open-unlinked_bug_22177-2.dpatch
+LBUG_open-unlinked_bug_22177-3.dpatch
diff --git a/debian/patches/LBUG_open-unlinked_bug_22177-1.dpatch 
b/debian/patches/LBUG_open-unlinked_bug_22177-1.dpatch
new file mode 100644
index 000..b5588b9
--- /dev/null
+++ b/debian/patches/LBUG_open-unlinked_bug_22177-1.dpatch
@@ -0,0 +1,132 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## LBUG_open-unlinked_bug_22177-1.dpatch by Patrick Winnertz 
win...@debian.org
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from bugzilla #22177
+
+...@dpatch@
+diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
+index 97dc613..3c53148 100644
+--- a/lustre/mds/mds_reint.c
 b/lustre/mds/mds_reint.c
+@@ -1755,31 +1755,37 @@ static int mds_orphan_add_link(struct 
mds_update_record *rec,
+  * for linking and return real mode back then -bzzz */
+ mode = inode-i_mode;
+ inode-i_mode = S_IFREG;
+-/* avoid vfs_link upon 0 nlink inode */
+-++inode-i_nlink;
++/* avoid vfs_link upon 0 nlink inode, inc by 2 instead of 1 because
++ * ext3_inc_count() can reset i_nlink for indexed directory */
++inode-i_nlink += 2;
+ rc = ll_vfs_link(dentry, mds-mds_vfsmnt, pending_dir, pending_child,
+  mds-mds_vfsmnt);
+ if (rc)
+-CERROR(error linking orphan %s to PENDING: rc = %d\n,
++CERROR(error linking orphan %s %s to PENDING: rc = %d\n,
++   S_ISDIR(mode) ? dir : S_ISREG(mode) ? file : 
other,
+rec-ur_name, rc);
+ else
+ mds_inode_set_orphan(inode);
+ 
+ /* return mode and correct i_nlink if inode is directory */
+ inode-i_mode = mode;
+-LASSERTF(inode-i_nlink == 2, %s nlink == %d\n,
++LASSERTF(rc || inode-i_nlink == 3, %s nlink == %d\n,
+  S_ISDIR(mode) ? dir : S_ISREG(mode) ? file : other,
+  inode-i_nlink);
++
+ if (S_ISDIR(mode)) {
+ pending_dir-i_nlink++;
+ if (pending_dir-i_sb-s_op-dirty_inode)
+ pending_dir-i_sb-s_op-dirty_inode(pending_dir);
+-} else {
+---inode-i_nlink;
+-if (inode-i_sb-s_op-dirty_inode)
+-inode-i_sb-s_op-dirty_inode(inode);
+ }
+ 
++inode-i_nlink -= 2;
++if (inode-i_sb-s_op-dirty_inode)
++inode-i_sb-s_op-dirty_inode(inode);
++
++if (rc)
++GOTO(out_dput, rc);
++
+ GOTO(out_dput, rc = 1);
+ out_dput:
+ l_dput(pending_child);
+@@ -2048,11 +2054,18 @@ static int mds_reint_unlink(struct mds_update_record 
*rec, int offset,
+ }
+ 
+ if (rc == 0  child_inode-i_nlink == 0) {
+-if (mds_orphan_needed(obd, child_inode))
++if (mds_orphan_needed(obd, child_inode)) {
+ rc = mds_orphan_add_link(rec, obd, dchild);
+-
+-if (rc == 1)
+-GOTO(cleanup, rc = 0);
++if (rc == 1)
++/* child inode was successfully linked
++ * to PENDING */
++GOTO(cleanup, rc = 0);
++else
++/* we failed to move the file to PENDING,
++ * really unlink the file as if there were
++ * no more openers */
++rc = 0;
++}
+ 
+ if (!S_ISREG(child_inode-i_mode))
+ GOTO(cleanup, rc);
+@@ -2738,11 +2751,18 @@ no_unlink:
+ }
+ 
+ if (rc == 0  new_inode != NULL  new_inode-i_nlink == 0) {
+-if (mds_orphan_needed(obd, new_inode))
++if (mds_orphan_needed(obd, new_inode)) {
+ rc = mds_orphan_add_link(rec, obd, de_new);
+ 
+-if (rc == 1)
+-GOTO(cleanup, rc = 0);
++if (rc == 1)
++/* inode successfully linked to PENDING */
++GOTO(cleanup, rc = 0);
++else
++/* we failed to move

[Pkg-lustre-svn-commit] updated: [4580895] Don't patch no-darwin.dpatch in, it seems to be broken

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 4580895edf54a73f1406c1cf9f078593891fbc23
Author: Patrick Winnertz win...@debian.org
Date:   Wed Apr 21 10:44:28 2010 +0200

Don't patch no-darwin.dpatch in, it seems to be broken

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/00list b/debian/patches/00list
index 1c10a15..522d376 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,11 +1,11 @@
 # patches
 page-size-undef-fixes.dpatch
-inode-no-i_blksize-2.6.20.dpatch
+#inode-no-i_blksize-2.6.20.dpatch
 posix_acl.dpatch
 ldiskfs-detect-2.6.20-2.6.22.dpatch
 no_default_debugging.dpatch
 autogen.sh.dpatch
-no-darwin.dpatch
+#no-darwin.dpatch
 libsysio.dpatch
 bug12769-ql-fix.dpatch
 # Debian patches

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

[Pkg-lustre-svn-commit] updated: [7c9f508] Updated no-strict-aliasing patch and removed non-needed stuff

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 7c9f50874c90ccb6bad1633a205204abe2cead2f
Author: Patrick Winnertz win...@debian.org
Date:   Wed Apr 21 11:08:00 2010 +0200

Updated no-strict-aliasing patch and removed non-needed stuff

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 4b88af0..bd62656 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/aclocal.m4 lustre/aclocal.m4
 --- lustre~/aclocal.m4 2010-03-11 13:05:55.0 +0100
-+++ lustre/aclocal.m4  2010-03-18 16:07:40.643923983 +0100
 lustre/aclocal.m4  2010-04-21 11:07:29.552195225 +0200
 @@ -1681,7 +1681,7 @@
  AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
  [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of 
super_block])
@@ -53,15 +53,19 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  LB_LINUX_TRY_COMPILE([
#include linux/fs.h
  ],[
-@@ -3246,7 +3246,7 @@
+@@ -3245,9 +3245,9 @@
+ AC_DEFUN([LC_CONFIGURE],
  [LC_CONFIG_OBD_BUFFER_SIZE
  
- if test $target_cpu == i686 -o $target_cpu == x86_64; then
+-if test $target_cpu == i686 -o $target_cpu == x86_64; then
 -CFLAGS=$CFLAGS -Werror
-+CFLAGS=$CFLAGS -Werror -fno-strict-aliasing
- fi
+-fi
++#if test $target_cpu == i686 -o $target_cpu == x86_64; then
++#CFLAGS=$CFLAGS -Werror -fno-strict-aliasing
++#fi
  
  # include/liblustre.h
+ AC_CHECK_HEADERS([asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h])
 @@ -5093,7 +5093,7 @@
  AC_DEFUN([LN_KERN__U64_LONG_LONG],
  [AC_MSG_CHECKING([kernel __u64 is long long type])
@@ -134,120 +138,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
# that says an option was ignored.
if grep 'ignoring option' conftest.err /dev/null 21; then :; else
  am_cv_$1_dependencies_compiler_type=$depmode
-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-11 13:05:55.0 +0100
-+++ lustre/ldiskfs/aclocal.m4  2010-03-18 16:07:40.643923983 +0100
-@@ -596,7 +596,7 @@
-grep sub/conftest.${OBJEXT-o} sub/conftest.Po  /dev/null 21 
-${MAKE-make} -s -f confmf  /dev/null 21; then
-   # icc doesn't choke on unknown options, it will just issue warnings
--  # (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 21; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/libsysio/aclocal.m4 lustre/libsysio/aclocal.m4
 lustre~/libsysio/aclocal.m42010-03-11 13:05:55.0 +0100
-+++ lustre/libsysio/aclocal.m4 2010-03-18 16:07:40.643923983 +0100
-@@ -221,7 +221,7 @@
-grep sub/conftest.${OBJEXT-o} sub/conftest.Po  /dev/null 21 
-${MAKE-make} -s -f confmf  /dev/null 21; 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
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/libsysio/configure.in lustre/libsysio/configure.in
 lustre~/libsysio/configure.in  2010-03-11 13:05:55.0 +0100
-+++ lustre/libsysio/configure.in   2010-03-18 16:07:40.643923983 +0100
-@@ -362,7 +362,7 @@
- 
- AC_MSG_CHECKING(for POSIX 2008 preadv)
- tmp_flags=$CFLAGS
--CFLAGS=$CFLAGS -Wall -Werror
-+CFLAGS=$CFLAGS -Wall -Werror -fno-strict-aliasing
- AC_TRY_COMPILE([
- #include sys/uio.h
- ssize_t preadv (int __fd, const struct iovec *__iovec,
-@@ -381,7 +381,7 @@
- 
- AC_MSG_CHECKING(for POSIX 2008 scandir)
- tmp_flags=$CFLAGS
--CFLAGS=$CFLAGS -Wall -Werror
-+CFLAGS=$CFLAGS -Wall -Werror -fno-strict-aliasing
- AC_TRY_COMPILE([
- #define _BSD_SOURCE
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre

[Pkg-lustre-svn-commit] updated: [f2892e9] fix mode of dpatch Signed-off-by: Patrick Winnertz win...@debian.org

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit f2892e9259c6d1e322a085614e3aba778a572587
Author: Patrick Winnertz win...@debian.org
Date:   Mon Mar 8 16:54:48 2010 +0100

fix mode of dpatch
Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/fix_dentry_conf_test.dpatch 
b/debian/patches/fix_dentry_conf_test.dpatch
old mode 100644
new mode 100755

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

[Pkg-lustre-svn-commit] updated: [ad70829] Fix configure on debian unstable, which is broken since a autofoo update

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit ad708293b2d7c235607edf5faff2b1c3e48cc60c
Author: Patrick Winnertz win...@debian.org
Date:   Thu Mar 4 21:41:43 2010 +0100

Fix configure on debian unstable, which is broken since a autofoo update

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/00list b/debian/patches/00list
index 6a96baa..c818957 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -29,4 +29,5 @@ fix_various_typecasts.dpatch
 #build-fixes-for_2.6.18_servers.dpatch
 no-strict-aliasing.dpatch
 fix_bashisms_for_dash.dpatch
+configure_error_on_unstable.patch
 autogen-run.dpatch
diff --git a/debian/patches/configure_error_on_unstable.dpatch 
b/debian/patches/configure_error_on_unstable.dpatch
new file mode 100755
index 000..9c24703
--- /dev/null
+++ b/debian/patches/configure_error_on_unstable.dpatch
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## autogen.dpatch by Patrick Winnertz win...@debian.org
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix configure on debian unstable
+
+...@dpatch@
+diff -u -p -r1.14 lustre-build-darwin.m4
+--- build/autoconf/lustre-build-darwin.m4  14 May 2009 15:23:33 -  
1.14
 build/autoconf/lustre-build-darwin.m4  1 Nov 2009 22:19:54 -
+@@ -16,7 +16,7 @@ AS_IF([AC_TRY_COMMAND(nm /mach | grep [
+   AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$ac_func])) $2
+ ],[
+   AC_MSG_RESULT([no]) $3
+-])dnl
++])
+ done
+ ])
+ 
+diff -u -p -r1.65 lustre-build-linux.m4
+--- build/autoconf/lustre-build-linux.m4   28 Jul 2009 12:41:53 -  
1.65
 build/autoconf/lustre-build-linux.m4   1 Nov 2009 22:19:54 -
+@@ -343,7 +343,7 @@ rm -f build/conftest.o build/conftest.mo
+ AS_IF([AC_TRY_COMMAND(cp conftest.c build  make -d [$2] ${LD:+LD=$LD} 
CC=$CC -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG 
LINUXINCLUDE=$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 
's/ppc.*/powerpc/' -e 's/x86_64/x86/'`/include -I$LINUX/include 
-I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h 
-o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ 
EXTRA_CFLAGS=-Werror-implicit-function-declaration $EXTRA_KCFLAGS $ARCH_UM 
$MODULE_TARGET=$PWD/build) /dev/null  AC_TRY_COMMAND([$3])],
+   [$4],
+   [_AC_MSG_LOG_CONFTEST
+-m4_ifvaln([$5],[$5])dnl])dnl
++m4_ifvaln([$5],[$5])dnl])
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o 
build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl
+ ])
+ 

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

[Pkg-lustre-svn-commit] updated: [fd87f57] Fixed some lintian warnings concerning debian/control

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit fd87f57bcf629cdbb057877887667429a57be37c
Author: Patrick Winnertz win...@debian.org
Date:   Mon Mar 8 12:10:33 2010 +0100

Fixed some lintian warnings concerning debian/control

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/control b/debian/control
index dd0ef6a..26e698a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,7 @@ Vcs-Cvs: -d :pserver:anonym...@cvs.lustre.org:/lustre
 Package: linux-patch-lustre
 Section: kernel
 Architecture: all
-Priority: optional
-Depends: ${kpatch:Depends}
+Depends: ${kpatch:Depends}, ${misc:Depends}
 Recommends: kernel-package, quilt
 Description: Linux kernel patch for the Lustre Filesystem
  Lustre is a scalable, secure, robust, highly-available 
@@ -31,8 +30,7 @@ Description: Linux kernel patch for the Lustre Filesystem
 Package: lustre-source
 Section: kernel
 Architecture: all
-Priority: optional
-Depends: module-assistant, bzip2, debhelper (= 5.0.0), libsnmp-dev, dpatch
+Depends: module-assistant, bzip2, debhelper (= 5.0.0), libsnmp-dev, dpatch, 
${misc:Depends}
 Description: source for Lustre filesystem client kernel modules
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  It is maintained by Cluster Filesystems, Inc. and available from 
@@ -44,7 +42,6 @@ Description: source for Lustre filesystem client kernel 
modules
 Package: lustre-utils
 Section: utils
 Architecture: i386 powerpc amd64 ia64
-Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Userspace utilities for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
@@ -57,7 +54,6 @@ Description: Userspace utilities for the Lustre filesystem
 Package: lustre-tests
 Section: admin
 Architecture: i386 powerpc amd64 ia64
-Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Test suite for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
@@ -67,10 +63,9 @@ Description: Test suite for the Lustre filesystem
  This package provides a number of test utilities for the Lustre filesystem.
 
 Package: liblustre
-Priority: optional
 Architecture: i386 powerpc amd64 ia64
 Section: otherosfs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Runtime library for Lustre filesystem utilities
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  It is maintained by Cluster Filesystems, Inc. and available
@@ -91,9 +86,8 @@ Description: Runtime library for Lustre filesystem utilities
 
 Package: lustre-dev
 Section: libdevel
-Priority: optional
 Architecture: i386 powerpc amd64 ia64
-Depends: lustre-utils (= ${binary:Version})
+Depends: lustre-utils (= ${binary:Version}), ${misc:Depends}
 Description: Development files for the Lustre filesystem
  Lustre is a scalable, secure, robust, highly-available cluster file system.
  It is maintained by Cluster Filesystems, Inc. and available from 

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

[Pkg-lustre-svn-commit] updated: [3474fbb] Fix several more typecasts while building 2.6.26

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 3474fbb88d3fc6eb2a371bc5ed045e364cbc7e48
Author: Patrick Winnertz win...@debian.org
Date:   Mon Mar 8 14:53:36 2010 +0100

Fix several more typecasts while building 2.6.26

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 028f24c..d6a8e52 100755
--- a/debian/patches/no-strict-aliasing.dpatch
+++ b/debian/patches/no-strict-aliasing.dpatch
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/aclocal.m4 lustre/aclocal.m4
 --- lustre~/aclocal.m4 2010-03-08 10:46:38.0 +0100
-+++ lustre/aclocal.m4  2010-03-08 12:16:01.485811761 +0100
 lustre/aclocal.m4  2010-03-08 14:46:11.185807558 +0100
 @@ -1681,7 +1681,7 @@
  AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
  [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of 
super_block])
@@ -136,7 +136,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  am_cv_$1_dependencies_compiler_type=$depmode
 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-08 10:46:38.0 +0100
-+++ lustre/ldiskfs/aclocal.m4  2010-03-08 12:16:01.489789083 +0100
 lustre/ldiskfs/aclocal.m4  2010-03-08 14:46:11.185807558 +0100
 @@ -596,7 +596,7 @@
 grep sub/conftest.${OBJEXT-o} sub/conftest.Po  /dev/null 21 
 ${MAKE-make} -s -f confmf  /dev/null 21; then
@@ -148,7 +148,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  am_cv_$1_dependencies_compiler_type=$depmode
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/libsysio/aclocal.m4 lustre/libsysio/aclocal.m4
 --- lustre~/libsysio/aclocal.m42010-03-08 10:46:38.0 +0100
-+++ lustre/libsysio/aclocal.m4 2010-03-08 12:16:01.493779464 +0100
 lustre/libsysio/aclocal.m4 2010-03-08 14:46:11.189782924 +0100
 @@ -221,7 +221,7 @@
 grep sub/conftest.${OBJEXT-o} sub/conftest.Po  /dev/null 21 
 ${MAKE-make} -s -f confmf  /dev/null 21; then
@@ -160,7 +160,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
#   icc: Command line warning: ignoring option '-M'; no argument 
required
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/libsysio/configure.in lustre/libsysio/configure.in
 --- lustre~/libsysio/configure.in  2010-03-08 10:46:38.0 +0100
-+++ lustre/libsysio/configure.in   2010-03-08 12:16:01.493779464 +0100
 lustre/libsysio/configure.in   2010-03-08 14:46:11.189782924 +0100
 @@ -362,7 +362,7 @@
  
  AC_MSG_CHECKING(for POSIX 2008 preadv)
@@ -181,7 +181,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/autoconf/lustre-lnet.m4 lustre/lnet/autoconf/lustre-lnet.m4
 --- lustre~/lnet/autoconf/lustre-lnet.m4   2010-03-08 10:46:38.0 
+0100
-+++ lustre/lnet/autoconf/lustre-lnet.m42010-03-08 12:16:01.497779902 
+0100
 lustre/lnet/autoconf/lustre-lnet.m42010-03-08 14:46:11.189782924 
+0100
 @@ -1073,7 +1073,7 @@
  AC_DEFUN([LN_KERN__U64_LONG_LONG],
  [AC_MSG_CHECKING([kernel __u64 is long long type])
@@ -246,8 +246,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
#include linux/sched.h
#include linux/fs_struct.h
 diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
 lustre~/lustre/autoconf/lustre-core.m4 2010-03-08 12:16:00.614780031 
+0100
-+++ lustre/lustre/autoconf/lustre-core.m4  2010-03-08 12:16:01.497779902 
+0100
+--- lustre~/lustre/autoconf/lustre-core.m4 2010-03-08 14:46:10.350777829 
+0100
 lustre/lustre/autoconf/lustre-core.m4  2010-03-08 14:46:11.193781476 
+0100
 @@ -651,7 +651,7 @@
  AC_DEFUN([LC_UMOUNTBEGIN_HAS_VFSMOUNT],
  [AC_MSG_CHECKING([if umount_begin needs vfsmount parameter instead of 
super_block])
@@ -303,8 +303,8 @@ 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~/lustre/llite/file.c lustre/lustre/llite/file.c

[Pkg-lustre-svn-commit] updated: [ccab816] Fix one configure target, which uses undefined HAVE_EXPORTFS_H variable

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit ccab816ad740009781d525167b6733f3ec0ff04d
Author: Patrick Winnertz win...@debian.org
Date:   Mon Mar 8 16:43:26 2010 +0100

Fix one configure target, which uses undefined HAVE_EXPORTFS_H variable

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/fix_dentry_conf_test.dpatch 
b/debian/patches/fix_dentry_conf_test.dpatch
new file mode 100644
index 000..ca85a71
--- /dev/null
+++ b/debian/patches/fix_dentry_conf_test.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no_default_debugging.patch by Patrick Winnertz win...@debian.org
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: HAVE_LINUX_EXPORTFS_H not defined in configure target :S
+
+...@dpatch@
+diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
+index d01d8e0..ac8eb0e 100644
+--- a/lustre/autoconf/lustre-core.m4
 b/lustre/autoconf/lustre-core.m4
+@@ -1243,11 +1243,8 @@ LB_LINUX_TRY_COMPILE([
+ AC_DEFUN([LC_FH_TO_DENTRY],
+ [AC_MSG_CHECKING([if kernel has .fh_to_dentry member in export_operations 
struct])
+ LB_LINUX_TRY_COMPILE([
+-#ifdef HAVE_LINUX_EXPORTFS_H
+-#include linux/exportfs.h
+-#else
+-#include linux/fs.h
+-#endif
++#include linux/exportfs.h
++#include linux/fs.h
+ ],[
+ struct export_operations exp;
+ 

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

[Pkg-lustre-svn-commit] updated: [61dbeb8] Change mode of dpatch file

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 61dbeb8409fd1c2ea2915bdfb3ef76372f6e59e1
Author: Patrick Winnertz win...@debian.org
Date:   Thu Mar 4 13:25:04 2010 +0100

Change mode of dpatch file

Signed-off-by: Patrick Winnertz win...@debian.org

diff --git a/debian/patches/fix_bashisms_for_dash.dpatch 
b/debian/patches/fix_bashisms_for_dash.dpatch
old mode 100644
new mode 100755

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

[Pkg-lustre-svn-commit] updated: [3c58392] Merge commit 'upstream/1.8.1.1'

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit 3c58392f64ff2855211c2d3f4204f3af98fc3b1c
Merge: ea79bf998e490b67b0a21b7f873e570d94fe6285 
e366fe91b572879acca30a87c61206ab8824858b
Author: Patrick Winnertz win...@debian.org
Date:   Wed Mar 3 14:34:31 2010 +0100

Merge commit 'upstream/1.8.1.1'


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

[Pkg-lustre-svn-commit] deleted: [09275dc] Imported Upstream version 1.8.1.1

[Patrick Winnertz]

The annotated tag, upstream/1.8.1.1 has been deleted
   was  d551b379c295a009f3a17951390f78f2d2110ccc

---
tag upstream/1.8.1.1


Upstream version 1.8.1.1
09275dc946ca46c4ca927e60fce92b2f6baf156e Imported Upstream version 1.8.1.1
---

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

[Pkg-lustre-svn-commit] updated: [d4721ee] Merge commit 'upstream/1.8.2'

[Patrick Winnertz]

The following commit has been merged in the master branch:
commit d4721ee3f6b1eca18e91a702fea38c847b9c773f
Merge: 23d76113342262c528c86dffc80c52b68057ccce 
08d81549b6c04bab80a09dcdaf29c3bdb61bfa93
Author: Patrick Winnertz win...@debian.org
Date:   Wed Mar 3 14:44:38 2010 +0100

Merge commit 'upstream/1.8.2'


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