Bump xfsprogs version number, tweak debian packaging.

Merge of master-melb:xfs-cmds:21782a by kenmcd.

diff --git a/VERSION b/VERSION
index c99eb5a3ad2dce0cfe96c6db6d80e495fa7e798b..0dc331bc2db0321353d4e5ca83b05872be81c34e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=6
-PKG_REVISION=25
+PKG_REVISION=26
 PKG_BUILD=1

diff --git a/debian/changelog b/debian/changelog
index a53e1d631c2a5bbb72d6bda182f57989615dff17..8556f85d005c1cafc472b0836caac14a57e2f7ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-xfsprogs (2.6.25-1) unstable; urgency=low
+xfsprogs (2.6.26-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release.
+  * Man page updates (closes: #295397)
+  * Fix compilation with gcc version 4 (closes: #297876)
+  * Switch build dependency from readline4 to readline5.
 
- -- Nathan Scott <nathans@debian.org>  Fri, 08 Oct 2004 08:55:03 +1000
+ -- Nathan Scott <nathans@debian.org>  Tue, 08 Mar 2005 16:56:35 +1100
 
 xfsprogs (2.6.23-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 5474aa42d69e21d23de713fb71232bbb8d6dd500..7ec1778b3faf2edc845cfd2b2f1dbe9b7a0b5b20 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfsprogs
 Section: admin
 Priority: optional
 Maintainer: Nathan Scott <nathans@debian.org>
-Build-Depends: uuid-dev, autoconf, debhelper, gettext, libtool, libreadline4-dev
+Build-Depends: uuid-dev, autoconf, debhelper, gettext, libtool, libreadline5-dev
 Standards-Version: 3.5.9
 
 Package: xfsprogs

diff --git a/doc/CHANGES b/doc/CHANGES
index 41ea9fefb3556f97e2d6e3b71d959cd62bc68803..600613b7f6465bf55f83f1dc917e7dc0afd3c6cd 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,21 @@
+xfsprogs-2.6.26 (08 March 2005)
+       - Fix compilation problem with version 4 of gcc
+         (thanks to Andreas Jochens).
+       - Added a streamlined <xfs/xfs.h> for programs wanting
+         to make use of the XFS-specific kernel interfaces (to
+         address complaints that <xfs/libxfs.h> was "heavy").
+       - Add imap as an expert command in xfs_io, making it
+         more easily accessible to those who need it.
+       - Extended statistics reporting for xfs_io command.
+       - Fixed readline support for current distributions.
+       - Add an --enable-termcap=[yes/no] configure option,
+         and changed --enable-readline=[yes/no] to not force
+         linking with libtermcap.  Builds on some platforms
+         may need to use both options, but most distributions
+         do not require --enable-termcap when linking against
+         libreadline.
+       - Minor man page updates.
+
 xfsprogs-2.6.25 (08 October 2004)
        - Fix build with really old glibc versions.