Say directory instead of dir in output messages

debian/changelog

@@ -87,6 +87,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     - Uppercase field names in error messages.
     - Expand EOF and eof into “end of file” in error messages.
     - Use “<enter>” instead of “return” or “enter” in input prompts.
+    - Say directory instead of dir in output messages.
 
   [ Raphaël Hertzog ]
   * Drop myself from Uploaders.

dselect/methods/multicd/setup

@@ -515,7 +515,7 @@ check_binary () {
 #  	fi
 
 	this_binary="$2"
-	echo -n "Using '$this_binary' as $1 binary dir"
+	echo -n "Using '$this_binary' as $1 binary directory"
 
 	if [ -n "$multi" ]; then
 		this_disk=`getdisklabel ${mountpoint} "/$hierbase"`
@@ -560,7 +560,7 @@ Say 'none' if this area is not available."
 			defaultbinary=none
 		fi
 		echo -n \
-"Enter _$1_ binary dir. [$4]
+"Enter _$1_ binary directory. [$4]
  ?  "
 		read response
 		if [ -z "$response" -a -n "$defaultbinary" ]

scripts/Dpkg/Source/Functions.pm

@@ -41,7 +41,7 @@ sub erasedir {
     subprocerr("rm -rf $dir") if $?;
     if (not stat($dir)) {
         return if $! == ENOENT;
-        syserr(g_("unable to check for removal of dir `%s'"), $dir);
+        syserr(g_("unable to check for removal of directory '%s'"), $dir);
     }
     error(g_("rm -rf failed to remove `%s'"), $dir);
 }

scripts/Dpkg/Source/Package/V1.pm

@@ -339,7 +339,7 @@ sub do_build {
     if ($sourcestyle =~ m/[kpKP]/) {
         if (stat($origdir)) {
             unless ($sourcestyle =~ m/[KP]/) {
-                error(g_("orig dir `%s' already exists, not overwriting, ".
+                error(g_("orig directory '%s' already exists, not overwriting, ".
                          'giving up; use -sA, -sK or -sP to override'),
                       $origdir);
             }
@@ -347,7 +347,7 @@ sub do_build {
             erasedir($origdir);
             pop_exit_handler();
         } elsif ($! != ENOENT) {
-            syserr(g_("unable to check for existence of orig dir `%s'"),
+            syserr(g_("unable to check for existence of orig directory '%s'"),
                     $origdir);
         }
 

scripts/dpkg-gencontrol.pl

@@ -84,7 +84,7 @@ sub usage {
   -F<changelog-format>     force changelog format.
   -v<force-version>        set version of binary package.
   -f<files-list-file>      write files here instead of debian/files.
-  -P<package-build-dir>    temporary build dir instead of debian/tmp.
+  -P<package-build-dir>    temporary build directory instead of debian/tmp.
   -n<filename>             assume the package filename will be <filename>.
   -O[<file>]               write to stdout (or <file>), not .../DEBIAN/control.
   -is, -ip, -isp, -ips     deprecated, ignored for compatibility.

scripts/dpkg-gensymbols.pl

@@ -64,7 +64,7 @@ sub usage {
     . "\n\n" . g_(
 'Options:
   -p<package>              generate symbols file for package.
-  -P<package-build-dir>    temporary build dir instead of debian/tmp.
+  -P<package-build-dir>    temporary build directory instead of debian/tmp.
   -e<library>              explicitly list libraries to scan.
   -v<version>              version of the packages (defaults to
                            version extracted from debian/changelog).

scripts/dpkg-name.pl

@@ -55,8 +55,8 @@ Options:
   -a, --no-architecture    no architecture part in filename.
   -o, --overwrite          overwrite if file exists.
   -k, --symlink            don't create a new file, but a symlink.
-  -s, --subdir [dir]       move file into subdir (use with care).
-  -c, --create-dir         create target dir if not there (use with care).
+  -s, --subdir [dir]       move file into subdirectory (use with care).
+  -c, --create-dir         create target directory if not there (use with care).
   -?, --help               show this help message.
   -v, --version            show the version.
 

scripts/dpkg-scanpackages.pl

@@ -186,7 +186,7 @@ else {
 my ($binarydir, $override, $pathprefix) = @ARGV;
 
 if (not -d $binarydir) {
-    error(g_('binary dir %s not found'), $binarydir);
+    error(g_('binary directory %s not found'), $binarydir);
 }
 if (defined $override and not -e $override) {
     error(g_('override file %s not found'), $override);

src/remove.c

@@ -539,7 +539,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
         debug(dbg_conffdetail, "removal_bulk conffile no dsd %s %s",
               fnvb.buf, strerror(e)); errno= e;
         if (errno == ENOENT || errno == ENOTDIR) continue;
-        ohshite(_("cannot read config file dir `%.250s' (from `%.250s')"),
+        ohshite(_("cannot read config file directory '%.250s' (from '%.250s')"),
                 fnvb.buf, conff->name);
       }
       debug(dbg_conffdetail, "removal_bulk conffile cleaning dsd %s", fnvb.buf);