Hi Dave, ----- Original Message ----- > [...] > This commit has been tagged with v3.2.0-rc2. I'd like everyone who > can test this to test it, as all the issues that needed to be solved > before a release could be made have now been addressed. If there are > no new regressions or critical issues reported in the next week or > so, I will make an official 3.2.0 release. So, please test. :) > I came across a couple of trivial build warnings when doing a test build, and added a doc note for the debian/changelog - updates are in a git tree over here if you'd like to pull 'em in... Changes committed to git://oss.sgi.com/nathans/xfsprogs.git master debian/changelog | 7 +++++++ libxfs/rdwr.c | 5 +++-- po/de.po | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) commit 75b480dad5f54d10e77750b2cf8793c04aa5537a Author: Nathan Scott <nathans@xxxxxxxxxx> Date: Sat May 3 16:13:00 2014 +1000 Update debian changelog in preparation for pending release In particular, add a note to the changelog about the added dh_autoconf use so the BTS will be updated appropriately. Signed-off-by: Nathan Scott <nathans@xxxxxxxxxx> commit ce5da129319024236ce7e1af6b0f1fb448bcf4c7 Author: Nathan Scott <nathans@xxxxxxxxxx> Date: Sat May 3 16:10:38 2014 +1000 Fix msgfmt warning when building the German translation Use the same header present in the Polish language files to resolve the following warning in the de.po build: [MSGFMT] de.mo de.po:7: warning: header field 'Language' missing in header Signed-off-by: Nathan Scott <nathans@xxxxxxxxxx> commit b47c8cae3637a81c50a7f1e42938fc20d947f3aa Author: Nathan Scott <nathans@xxxxxxxxxx> Date: Sat May 3 16:09:03 2014 +1000 Fix 32 bit build warning in libxfs, xfs_daddr_t printing Add the usual type casts to resolve the following warnings: rdwr.c: In function 'libxfs_getbufr_map': rdwr.c:499:4: warning: format '%lx' expects argument of type 'long unsigned int', but argument 5 has type 'xfs_daddr_t' [-Wformat] rdwr.c:499:4: warning: format '%lx' expects argument of type 'long unsigned int', but argument 6 has type 'xfs_daddr_t' [-Wformat] Signed-off-by: Nathan Scott <nathans@xxxxxxxxxx> -- Nathan
diff --git a/debian/changelog b/debian/changelog index 0935e07..c790c75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xfsprogs (3.2.0) unstable; urgency=low + + * New upstream release + + -- Nathan Scott <nathans@xxxxxxxxxx> Fri, 02 May 2014 10:19:34 +1000 + xfsprogs (3.1.11) unstable; urgency=low * New upstream release diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index ea4bdfd..57c12c1 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -495,8 +495,9 @@ libxfs_getbufr_map(struct xfs_buftarg *btp, xfs_daddr_t blkno, int bblen, if (blkno != map[0].bm_bn) { fprintf(stderr, - _("%s: %s map blkno %lx doesn't match key %lx\n"), - progname, __FUNCTION__, map[0].bm_bn, blkno); + _("%s: %s map blkno 0x%llx doesn't match key 0x%llx\n"), + progname, __FUNCTION__, (long long)map[0].bm_bn, + (long long)blkno); exit(1); } diff --git a/po/de.po b/po/de.po index 573380e..a13b5cc 100644 --- a/po/de.po +++ b/po/de.po @@ -11,6 +11,7 @@ msgstr "" "PO-Revision-Date: 2009-10-21 21:08+0100\n" "Last-Translator: Chris Leick <c.leick@xxxxxxxxxx>\n" "Language-Team: German <debian-l10n-german@xxxxxxxxxxxxxxxx>\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"
_______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs