Update Debian packaging in xfsprogs, revert a logprint arg handling thinko.

diff --git a/VERSION b/VERSION
index 92b207540add5c398f3add5353ad459368c2d950..392fe8613a802d29ba26e45302e5fa83ff264a19 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=6
-PKG_REVISION=13
+PKG_REVISION=14
 PKG_BUILD=1

diff --git a/debian/changelog b/debian/changelog
index ede67c8b5d5acf2ad90d97110dab5be78adc6e51..6deda9fc021d3e0fa597bdf7f906789e6563347e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-xfsprogs (2.6.12-1) unstable; urgency=low
+xfsprogs (2.6.14-1) unstable; urgency=low
 
   * New upstream release.
+  * Add a Provides: fsck-backend clause as requested in the context
+    of bug number 111651.
 
- -- Nathan Scott <nathans@debian.org>  Fri, 30 Apr 2004 05:13:20 +1000
+ -- Nathan Scott <nathans@debian.org>  Thu, 13 May 2004 09:56:19 +1000
 
 xfsprogs (2.6.11-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 720fb0540dae9a56107bfe032ca5c442bf6cd6da..eb65c15a05d04e8fae16bb70054d21f25846ab42 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,7 @@ Standards-Version: 3.5.9
 
 Package: xfsprogs
 Depends: ${shlibs:Depends}
+Provides: fsck-backend
 Suggests: xfsdump, attr, dvhtool, quota
 Conflicts: xfsdump (<< 2.0.0)
 Architecture: any

diff --git a/doc/CHANGES b/doc/CHANGES
index e120a16aff4df35d366789e70d297df3a6336073..5fd5dea6df21d3195fed8c9e363191d8c382242d 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,10 +1,11 @@
-[cvs]
+xfsprogs-2.6.14 (13 May 2004)
        - Allow logprint to copy a log to a file (-C) and to dump
          a log from beginning to end showing ondisk log record (-d).
        - Fix logprint handling of -f option - shouldn't be doing
          the UUID check in that case, since we don't have the SB.
        - Remove MD device superblock "clean" check, following Neil
          Brown's advice.
+       - Small Debian packaging tweak to say xfsprogs has an fsck.
 
 xfsprogs-2.6.13 (03 May 2004)
        - Zero out more at beginning and end of device at mkfs time

diff --git a/logprint/logprint.c b/logprint/logprint.c
index 3aae61ef9138a9a905bc6852b53da38ccf445c02..e2cd26f0af9dea36fa1b4ffce1dead97d6df2e8f 100644 (file)
--- a/logprint/logprint.c
+++ b/logprint/logprint.c
@@ -251,10 +251,10 @@ main(int argc, char **argv)
 
        switch (print_operation) {
        case OP_PRINT:
-               xfs_log_print_trans(&log, print_start);
+               xfs_log_print(&log, logfd, print_start);
                break;
        case OP_PRINT_TRANS:
-               xfs_log_print(&log, logfd, print_start);
+               xfs_log_print_trans(&log, print_start);
                break;
        case OP_DUMP:
                xfs_log_dump(&log, logfd, print_start);