elide irrelevant libdsk help content from usage messages

diff --git a/cpmls.c b/cpmls.c
index 983817a0bf033de357b04d4bf7ca199974f9e943..1db4fba2748f6207f14e65893366bb326cbff5db 100644 (file)
--- a/cpmls.c
+++ b/cpmls.c
@@ -360,7 +360,11 @@ int main(int argc, char *argv[])
 
   if (usage)
   {
+#if HAVE_LIBDSK_H
     fprintf(stderr,"Usage: %s [-f format] [-T libdsk-type] [-d|-D|-F|-A|[-l][-c][-i]] image [file ...]\n",cmd);
+#else
+    fprintf(stderr,"Usage: %s [-f format] [-d|-D|-F|-A|[-l][-c][-i]] image [file ...]\n",cmd);
+#endif
     exit(1);
   }
   /*}}}*/

diff --git a/debian/changelog b/debian/changelog
index 3953ed35badb7343306cf558a8c3c98a57bde642..78e03ff988a8ef9bae44a63f4a011d242f090fca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpmtools (2.10-2) unstable; urgency=low
+
+  * elide '-T libdsk-type' from executable usage messages, closes: #554342
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 03 Nov 2009 21:25:26 -0700
+
 cpmtools (2.10-1) unstable; urgency=low
 
   * new upstream version