Merge of xfs-cmds-2.4.18:slinx:111138a by nathans.

  bump to version 2.0.0 for extended attribute and other interface changes.
  incorporate new code, docs, etc from ext2/ext3 project.

3 files changed, 28 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index e607335..6a93561 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-attr (1.1.4-1) unstable; urgency=low
+attr (2.0.0-1) unstable; urgency=low
 
-  * Bug fix in attr_multi(3), use of "count" parameter was broken
+  * Major new upstream release
+  * Several system call changes - THIS WILL NOT WORK WITH OLD KERNELS!
+  * Uses the new shared ext2/ext3/XFS extended attributes interfaces
 
- -- Nathan Scott <nathans@debian.org>  Fri, 11 Jan 2002 08:43:58 +1100
+ -- Nathan Scott <nathans@debian.org>  Thu,  7 Feb 2002 13:25:26 +1100
 
 attr (1.1.3-0) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 09a5e22..b4bb381 100644
--- a/debian/control
+++ b/debian/control
@@ -7,24 +7,26 @@ Standards-Version: 3.5.5
 
 Package: attr
 Depends: ${shlibs:Depends}
+Conflicts: xfsdump (<< 2.0.0)
 Architecture: any
-Description: Utility for manipulating filesystem extended attributes
- A utility for manipulating extended attributes on filesystem
- objects, compatible with the SGI IRIX tool of the same name.
+Description: Utilities for manipulating filesystem extended attributes
+ A set of tools for manipulating extended attributes on filesystem
+ objects, in particular getfattr(1) and setfattr(1).
+ An attr(1) command is also provided which is largely compatible
+ with the SGI IRIX tool of the same name.
 
 Package: attr-dev
 Section: devel
 Priority: extra
-Depends: libc6-dev, attr
+Depends: libc6-dev, attr (>= 2.0.0)
+Conflicts: attr (<< 2.0.0)
 Architecture: any
-Description: Extended attribute static libraries and headers.
+Description: Extended attribute static libraries and headers
  attr-dev contains the libraries and header files needed to develop
- programs which make use of extended attributes.
+ programs which make use of extended attributes.  For Linux programs,
+ the documented system call API is the recommended interface, but an
+ SGI IRIX compatibility interface is also provided.
  .
- This interface is compatible with the SGI IRIX extended attribute
- interface, and makes use of an unofficial Linux system call.
- .
- Currently only XFS is supported, and the (experimental, unofficial)
- system call interface is likely to change in the future.  However,
- the API built above this system call is unlikely to change and is
+ Currently only ext2, ext3 and XFS support extended attributes.
+ The SGI IRIX compatibility API built above the Linux system calls is
  used by programs such as xfsdump(8), xfsrestore(8) and xfs_fsr(8).
diff --git a/debian/copyright b/debian/copyright
index d956166..2e88adb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,10 +5,15 @@ It can be downloaded from ftp://oss.sgi.com/projects/xfs/download/
 
 Copyright:
 
-Copyright (C) 2000 Silicon Graphics, Inc.
+Copyright (C) 2001 Silicon Graphics, Inc.
+Copyright (C) 2001 Andreas Gruenbacher.
 
-You are free to distribute this software under the terms of
-the GNU General Public License.
+You are free to distribute this software under Version 2.1
+of the GNU Lesser General Public License.
+On Debian systems, refer to /usr/share/common-licenses/LGPL-2.1
+for the complete text of the GNU Lesser General Public License.
+
+Certain components (as annotated in the source) are licensed
+under the terms of the GNU General Public License.
 On Debian systems, the complete text of the GNU General Public
 License can be found in /usr/share/common-licenses/GPL file.
-