[Hostname-devel] [SCM] Git repository for hostname branch, master, updated. debian/3.12-3-gf9d2c4b

[Michael Meskes]

The following commit has been merged in the master branch:
commit d7e051d71de19240c5abcd33cd98637c32c614f6
Author: Michael Meskes <meskes at debian.org>
Date:   Tue Jun 18 11:50:35 2013 +0200

    Finally completely remove verbose option.
    
    Closes: #703974
    
    Thanks: Jiri Popelka <jpopelka at redhat.com>

diff --git a/debian/changelog b/debian/changelog
index abe86c4..6923218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hostname (3.13) unstable; urgency=low
+
+  * Finally completely remove verbose option.
+    Thanks to Jiri Popelka <jpopelka at redhat.com> (Closes: #703974)
+
+ -- Michael Meskes <meskes at debian.org>  Tue, 18 Jun 2013 11:51:37 +0200
+
 hostname (3.12) unstable; urgency=low
 
   * Rewrote parts of the manpage.
diff --git a/hostname.1 b/hostname.1
index 48aed71..697326a 100644
--- a/hostname.1
+++ b/hostname.1
@@ -14,7 +14,6 @@ dnsdomainname \- show the system's DNS domain name
 
 .SH SYNOPSIS
 .B hostname
-.RB [ \-v ]
 .RB [ \-a|\-\-alias ]
 .RB [ \-d|\-\-domain ]
 .RB [ \-f|\-\-fqdn|\-\-long ]
@@ -25,13 +24,11 @@ dnsdomainname \- show the system's DNS domain name
 .RB [ \-y|\-\-yp|\-\-nis ]
 .br
 .B hostname
-.RB [ \-v ]
 .RB [ \-b|\-\-boot ]
 .RB [ \-F|\-\-file\ filename ]
 .RB [ hostname ]
 .br
 .B hostname
-.RB [ \-v ]
 .RB [ \-h|\-\-help ]
 .RB [ \-V|\-\-version ]
 .PP
@@ -48,7 +45,6 @@ dnsdomainname \- show the system's DNS domain name
 .RB [ \-F\ file ]
 .PP
 .B dnsdomainname
-.RB [ \-v ]
 
 .SH DESCRIPTION
 .B Hostname
@@ -224,9 +220,6 @@ order of the output.
 .I "\-s, \-\-short"
 Display the short host name. This is the host name cut at the first dot.
 .TP
-.I "\-v, \-\-verbose"
-Be verbose and tell what's going on.
-.TP
 .I "\-V, \-\-version"
 Print version information on standard output and exit successfully.
 .TP
diff --git a/hostname.c b/hostname.c
index 5373bc8..7f35c08 100644
--- a/hostname.c
+++ b/hostname.c
@@ -146,16 +146,16 @@ void
 usage(FILE *stream)
 {
 	fprintf(stream,
-		"Usage: hostname [-v] [-b] {hostname|-F file}         set host name (from file)\n"
-		"       hostname [-v] [-a|-A|-d|-f|-i|-I|-s|-y]       display formatted name\n"
-		"       hostname [-v]                                 display host name\n"
+		"Usage: hostname [-b] {hostname|-F file}         set host name (from file)\n"
+		"       hostname [-a|-A|-d|-f|-i|-I|-s|-y]       display formatted name\n"
+		"       hostname                                 display host name\n"
 		"\n"
-		"       {yp,nis,}domainname [-v] {nisdomain|-F file}  set NIS domain name (from file)\n"
-		"       {yp,nis,}domainname [-v]                      display NIS domain name\n"
+		"       {yp,nis,}domainname {nisdomain|-F file}  set NIS domain name (from file)\n"
+		"       {yp,nis,}domainname                      display NIS domain name\n"
 		"\n"
-		"       dnsdomainname [-v]                            display dns domain name\n"
+		"       dnsdomainname                            display dns domain name\n"
 		"\n"
-		"       hostname -V|--version|-h|--help               print info and exit\n"
+		"       hostname -V|--version|-h|--help          print info and exit\n"
 		"\n"
 		"Program name:\n"
 		"       {yp,nis,}domainname=hostname -y\n"
@@ -447,7 +447,6 @@ main(int argc, char **argv)
 		{"long", no_argument, 0, 'f'},
 		{"short", no_argument, 0, 's'},
 		{"version", no_argument, 0, 'V'},
-		{"verbose", no_argument, 0, 'v'},
 		{"alias", no_argument, 0, 'a'},
 		{"ip-address", no_argument, 0, 'i'},
 		{"all-ip-addresses", no_argument, 0, 'I'},
@@ -467,7 +466,7 @@ main(int argc, char **argv)
 	else if (!strcmp(progname, "nisdomainname"))
 		type = NIS_DEF;
 
-	while((o = getopt_long(argc, argv, "aAdfbF:h?iIsVvy", long_options, NULL)) != -1)
+	while((o = getopt_long(argc, argv, "aAdfbF:h?iIsVy", long_options, NULL)) != -1)
 		switch (o) {
 		case 'd':
 			type = DNS;
@@ -499,9 +498,6 @@ main(int argc, char **argv)
 		case 'F':
 			file = optarg;
 			break;
-		case 'v':
-			/* Does not do anything. */
-			break;
 		case 'V':
 			printf("hostname %s\n", VERSION);
 			return 0;

-- 
Git repository for hostname