Minor Debian packaging updates, and man page typoe fixes from Debian.

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

diff --git a/VERSION b/VERSION
index 4c61d9944aa1398d1e7de138ad577b7a832cb2f8..531d0b5ba19de1554ee34ca3cb184b558dff5571 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=8
-PKG_REVISION=3
+PKG_REVISION=4
 PKG_BUILD=1

diff --git a/debian/changelog b/debian/changelog
index fa54de6bfa4eed371ca885a9851fc5378885615b..0c64155a2ce13c9c402d3574648cf7c3e6bd94ac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xfsprogs (2.8.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Improved udeb packaging, thanks to Frans Pop (closes: #375439)
+  * Fix filesystem-from-path detection logic (closes: #374687)
+
+ -- Nathan Scott <nathans@debian.org>  Mon, 26 Jun 2006 10:04:18 +1000
+
 xfsprogs (2.8.3-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 89b661e1ca044ce036db07f274c3a759f11b828d..16a52c87929f9080d75512c807799b0cd6cbef36 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Description: XFS filesystem-specific static libraries and headers
  develop XFS filesystem-specific programs.
 
 Package: xfsprogs-udeb
+XC-Package-Type: udeb
 Section: debian-installer
 Priority: optional
 Architecture: any

diff --git a/debian/rules b/debian/rules
index 667ffe2ac1344731f74a075e9d358651773136ed..f839adabf7bd418183f46e867af687c78c2130d6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -69,20 +69,17 @@ binary-arch: checkroot built
        $(pkgdi)  $(MAKE) -C debian install-d-i
        $(pkgme)  $(MAKE) -C build src-manifest
 
-       dh_installdocs -p$(package) -p$(develop)
-       dh_installchangelogs -N$(bootpkg)
+       dh_installdocs
+       dh_installchangelogs
        dh_strip
        dh_compress
        dh_fixperms
-       dh_makeshlibs -p$(package)
-       dh_installdeb -N$(bootpkg)
+       dh_makeshlibs
+       dh_installdeb
        dh_shlibdeps
-       dh_gencontrol -N$(bootpkg)
-       dh_gencontrol -p$(bootpkg) -- -n$(udebpkg)
-
-       dh_md5sums -N$(bootpkg)
-       dh_builddeb -N$(bootpkg)
-       dh_builddeb -p$(bootpkg) --filename=$(udebpkg)
+       dh_gencontrol
+       dh_md5sums
+       dh_builddeb
 
 binary: binary-indep binary-arch
 

diff --git a/doc/CHANGES b/doc/CHANGES
index 49a37f8305615285d34a098516b63f3f28f4f766..bdfe6474126c69b8622cf23342707ff925073649 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,5 +1,11 @@
+xfsprogs-2.8.4 (23 June 2006)
+       - Improve Debian udeb package handling, thanks to Frans Pop.
+       - Fix a situation where xfs_growfs can fail to match a block
+         device to a filesystem correctly; thanks to Bastian Kleineidam.
+       - Minor corrections to the xfs_growfs man page.
+
 xfsprogs-2.8.3 (21 June 2006)
-       - Fix a possible segv in xfs_growfs.
+       - Fix a possible segv in xfs_growfs; thanks to Bastian Kleineidam.
 
 xfsprogs-2.8.2 (17 June 2006)
        - More updates to repair/libxfs for improving performance

diff --git a/man/man8/xfs_growfs.8 b/man/man8/xfs_growfs.8
index a61ec7a95ec9a66d5dbfcf7fdbef96bae3876259..3f238fa87e77e9d4d4d4e686dee3b7698bbf75d1 100644 (file)
--- a/man/man8/xfs_growfs.8
+++ b/man/man8/xfs_growfs.8
@@ -106,6 +106,8 @@ the \f2xfs_growfs\f1 operation.
 .TP
 .B \-t
 Specifies an alternate mount table file (default is
+.I /proc/mounts
+if it exists, else
 .IR /etc/mtab ).
 This is used when working with filesystems mounted without writing to
 .I /etc/mtab
@@ -117,8 +119,10 @@ for further details.
 is most often used in conjunction with
 logical volumes
 (see
+.IR md (4)
+and
 .IR lvm (8)
-).
+on Linux).
 However, it can also be used on a regular disk partition, for example if a
 partition has been enlarged while retaining the same starting block.
 .SH PRACTICAL USE
@@ -130,5 +134,6 @@ Therefore there must be at least one spare new disk partition available.
 Adding the space is often done through the use of a logical volume manager.
 .SH SEE ALSO
 mkfs.xfs(8),
+md(4),
 lvm(8),
 mount(8).