From: Nathan Scott <nathans@sgi.com>
Date: Fri, 9 Aug 2002 06:07:41 +0000 (+0000)
Subject: bump version, document changes - libdisk fix, autoconf version fixes.
X-Git-Tag: v2.3.0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8a386bbd008006a975d23ffc36cc75cb2b3b6a9;p=thirdparty%2Fxfsprogs-dev.git

bump version, document changes - libdisk fix, autoconf version fixes.
---

diff --git a/VERSION b/VERSION
index 5cafc9fcb..0fd0459d8 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=2
-PKG_REVISION=0
+PKG_REVISION=1
 PKG_BUILD=0
diff --git a/configure.in b/configure.in
index 937946a6d..3f72ebf5a 100644
--- a/configure.in
+++ b/configure.in
@@ -43,6 +43,22 @@ pkg_builder=`id -u -n`@`hostname`
 test -z "$PACKAGE_BUILDER" || pkg_builder="$PACKAGE_BUILDER"
 AC_SUBST(pkg_builder)
 
+dnl standard or user-specified install paths
+pkg_bin_dir=${bindir}
+pkg_lib_dir=${libdir}
+pkg_inc_dir=${includedir}/xfs
+pkg_man_dir=${mandir}
+pkg_doc_dir=${datadir}/doc/${pkg_name}
+pkg_sbin_dir=${sbindir}
+pkg_devlib_dir=${libexecdir}
+AC_SUBST(pkg_bin_dir)
+AC_SUBST(pkg_lib_dir)
+AC_SUBST(pkg_inc_dir)
+AC_SUBST(pkg_man_dir)
+AC_SUBST(pkg_doc_dir)
+AC_SUBST(pkg_sbin_dir)
+AC_SUBST(pkg_devlib_dir)
+
 
 dnl output header with cpp defs HAVE_*, etc
 AC_CONFIG_HEADER(include/platform_defs.h)
diff --git a/debian/changelog b/debian/changelog
index 32fe9abd0..85cfca34c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-xfsprogs (2.2.0-1) unstable; urgency=low
+xfsprogs (2.2.1-1) unstable; urgency=low
 
   * New upstream release
   * Default mkfs.xfs blocksize is now 4096 bytes, not getpagesize(2)
+  * Fix to allow install process to work for newer autoconf versions
 
  -- Nathan Scott <nathans@debian.org>  Wed,  7 Aug 2002 11:37:23 +1000
 
diff --git a/doc/CHANGES b/doc/CHANGES
index 6951681c9..9b1b6042b 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,9 @@
+xfsprogs-2.2.1 (09 August 2002)
+	- Fix buglet in libdisk get_driver_block_major() routine which
+	  would result in incorrect majors being returned for not-found
+	  drivers.
+	- Fix problem in install process with newer autoconf versions.
+
 xfsprogs-2.2.0 (08 August 2002)
 	- mkfs.xfs defaults to a blocksize of 4096 bytes, and no longer
 	  uses getpagesize(2) to dynamically configure the default size.
diff --git a/include/builddefs.in b/include/builddefs.in
index 1c6263ce2..59718e8fe 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -52,13 +52,13 @@ PKG_RELEASE = @pkg_release@
 PKG_VERSION = @pkg_version@
 PKG_DISTRIBUTION = @pkg_distribution@
 PKG_BUILDER = @pkg_builder@
-PKG_BIN_DIR = @bindir@
-PKG_SBIN_DIR = @sbindir@
-PKG_LIB_DIR = @libdir@
-PKG_DEVLIB_DIR = @libexecdir@
-PKG_INC_DIR = @includedir@/xfs
-PKG_MAN_DIR = @mandir@
-PKG_DOC_DIR = @datadir@/doc/@pkg_name@
+PKG_BIN_DIR = @pkg_bin_dir@
+PKG_LIB_DIR = @pkg_lib_dir@
+PKG_INC_DIR = @pkg_inc_dir@
+PKG_MAN_DIR = @pkg_man_dir@
+PKG_DOC_DIR = @pkg_doc_dir@
+PKG_SBIN_DIR = @pkg_sbin_dir@
+PKG_DEVLIB_DIR = @pkg_devlib_dir@
 
 CC	= @cc@
 LD	= @ld@