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

  bump to version 2.0.0 for extended attribute and other interface changes.

6 files changed, 30 insertions, 10 deletions

diff --git a/VERSION b/VERSION
index ae88b32..9467406 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 #
 # This file is used by configure to get version information
 #
-PKG_MAJOR=0
-PKG_MINOR=3
+PKG_MAJOR=2
+PKG_MINOR=0
 PKG_REVISION=0
 PKG_BUILD=0
diff --git a/build/rpm/dmapi.spec.in b/build/rpm/dmapi.spec.in
index 34a614b..637b282 100644
--- a/build/rpm/dmapi.spec.in
+++ b/build/rpm/dmapi.spec.in
@@ -6,6 +6,7 @@ Distribution: @pkg_distribution@
 Packager: @pkg_builder@
 BuildRoot: @build_root@ 
 Prereq: /sbin/ldconfig
+Conflicts: xfsdump < 2.0.0
 Source: @pkg_name@-@pkg_version@.src.tar.gz
 Copyright: Copyright (C) 2000 Silicon Graphics, Inc.
 Vendor: Silicon Graphics, Inc.
@@ -22,7 +23,7 @@ by the libdm library.
 %package devel
 Summary: Data Management API static libraries and headers.
 Group: Development/Libraries
-Requires: @pkg_name@
+Requires: @pkg_name@ >= 2.0.0
 
 %description devel
 dmapi-devel contains the libraries and header files needed to
diff --git a/configure.in b/configure.in
index 8995d81..2afd346 100644
--- a/configure.in
+++ b/configure.in
@@ -105,6 +105,13 @@ AC_CHECK_HEADER(xfs/handle.h,, [
 	echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
 	exit 1
 ])
+AC_CHECK_LIB(handle, attr_list_by_handle,, [
+	echo
+	echo 'FATAL ERROR: could not find a current XFS handle library.'
+	echo 'Upgrade the xfsprogs-devel (rpm) or the xfslibs-dev (deb) package.'
+	echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
+	exit 1
+])
 
 dnl ensure libtool is installed
 AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
diff --git a/debian/changelog b/debian/changelog
index d620aa7..bcbd60d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dmapi (2.0.0-1) unstable; urgency=low
+
+  * Major release to coincide with switch to new extended attributes
+    system call interfaces
+
+ -- Nathan Scott <nathans@debian.org>  Thu,  7 Feb 2002 13:25:26 +1100
+
 dmapi (0.3.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 69cd710..a077c42 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: dmapi
 Section: admin
 Priority: optional
 Maintainer: Nathan Scott <nathans@debian.org>
-Build-Depends: xfslibs-dev (>= 1.3.3), autoconf, debmake, libtool
+Build-Depends: xfslibs-dev (>= 2.0.0), autoconf, debmake, libtool
 Standards-Version: 3.5.5
 
 Package: dmapi
 Depends: ${shlibs:Depends}
-Recommends: xfsdump
+Recommends: xfsdump (>= 2.0.0)
 Architecture: any
 Description: Data Management API runtime environment
  Files required by system software using the Data Management API
@@ -19,7 +19,8 @@ Description: Data Management API runtime environment
 Package: dmapi-dev
 Section: devel
 Priority: extra
-Depends: libc6-dev, dmapi, xfslibs-dev
+Depends: libc6-dev, dmapi (>= 2.0.0), xfslibs-dev (>= 2.0.0)
+Conflicts: dmapi (<< 2.0.0), xfslibs-dev (<< 2.0.0)
 Architecture: any
 Description: Data Management API static libraries and headers
  dmapi-dev contains the libraries and header files needed to
diff --git a/doc/CHANGES b/doc/CHANGES
index 217f310..610ae1f 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,16 +1,20 @@
-dmapi-0.3.0 (4 Dec 2001)
+dmapi-2.0.0 (07 February 2002)
+	- Major release to coincide with switch to new extended
+	  attributes system call interfaces
+
+dmapi-0.3.0 (04 December 2001)
 	- The kernel-side of dmapi is now a module, and the device has
 	  moved.  Change dmapi to use the dmapi device in its new
 	  location of /proc/fs/xfs_dmapi.
 
-dmapi-0.2.2 (27 Jul 2001)
+dmapi-0.2.2 (27 July 2001)
 	- fixes for (hopefully) the last few nits in libtool usage
 
-dmapi-0.2.1 (23 Jul 2001)
+dmapi-0.2.1 (23 July 2001)
 	- install static libs and libtool archives into /usr/lib
 	- shared libraries are unchanged, however
 
-dmapi-0.2.0 (19 Jul 2001)
+dmapi-0.2.0 (19 July 2001)
 	- reworked Makefiles use of libtool slightly
 	- rework some of the Debian packaging rules
 	- libdm is now installed into /lib instead of /usr/lib