Przeglądaj źródła

Do not use `' quote pairs for non-translatable strings

Guillem Jover 14 lat temu
rodzic
commit
50e40bc7a4

+ 65 - 68
doc/triggers.txt

@@ -52,8 +52,8 @@ package is said to await the trigger processing.
 
 A package which has pending triggers, or which awaits triggers, is not
 considered properly installed.  There are two new dpkg status values,
-`triggers-pending' and `triggers-awaited', which lie between
-`config-failed' and `installed'.
+‘triggers-pending’ and ‘triggers-awaited’, which lie between
+‘config-failed’ and ‘installed’.
 
 
 Details - Overview table
@@ -85,18 +85,17 @@ using dpkg-trigger of I by T need not make T become triggers-awaited
 in this way..)
 
 A package which awaits trigger processing but would otherwise be
-`installed' or `triggers-pending' is considered to be in state
-`triggers-awaited'.  Packages in `triggers-awaited' do not satisfy
+‘installed’ or ‘triggers-pending’ is considered to be in state
+‘triggers-awaited’.  Packages in ‘triggers-awaited’ do not satisfy
 Depends dependencies.
 
 Every triggered package I in T's list of awaited packages either has a
-nonempty list of pending triggers, or is in `config-failed' or worse.
-When I enters `installed' (or `config-files' or `not-installed'), the
+nonempty list of pending triggers, or is in ‘config-failed’ or worse.
+When I enters ‘installed’ (or ‘config-files’ or ‘not-installed’), the
 entry in T's list of awaited packages is removed so that T may, if it
-no longer awaits any packages, become `installed' or
-`triggers-pending'.
+no longer awaits any packages, become ‘installed’ or ‘triggers-pending’.
 
-Packages in `config-files' or `not-installed' do not await triggers.
+Packages in ‘config-files’ or ‘not-installed’ do not await triggers.
 
 
 Details - triggered package
@@ -105,27 +104,27 @@ Details - triggered package
 When one of the triggers in which a package is interested is
 activated, the triggered package has the trigger added to its list of
 pending triggers.  Packages with a nonempty list of pending triggers
-which would otherwise be in state `installed' are in state
-`triggers-pending' instead, so if the package was previously
-`installed' it becomes `triggers-pending'.
+which would otherwise be in state ‘installed’ are in state
+‘triggers-pending’ instead, so if the package was previously
+‘installed’ it becomes ‘triggers-pending’.
 
 If a package has nonempty lists both of pending and awaited triggers,
-then it is in `triggers-awaited'.  Nevertheless efforts will still be
+then it is in ‘triggers-awaited’.  Nevertheless efforts will still be
 made to process its triggers so as to make the list of pending
 triggers empty.
 
-To restore a package in state `triggers-pending' to `installed', or to
+To restore a package in state ‘triggers-pending’ to ‘installed’, or to
 process pending triggers of a package with both pending and awaited
 triggers, dpkg will run the postinst script:
    postinst triggered "<trigger-name> <trigger-name> ..."
 
 This will be attempted for each relevant package at the end of each
 dpkg run; so, normally, in the same dpkg run as the event which made
-the package go to `triggers-pending'.  This leaves packages in
+the package go to ‘triggers-pending’.  This leaves packages in
 reasonable states by default.
 
-If the `postinst triggered' run fails the package goes to
-`config-failed', so that the trigger processing will not be attempted
+If the “postinst triggered” run fails the package goes to
+‘config-failed’, so that the trigger processing will not be attempted
 again until explicitly requested.
 
 
@@ -161,20 +160,20 @@ again until explicitly requested.
        |   installed  or  t.-awaited with none pending    |
        `--------------------------------------------------'
 
-Packages in `config-failed' or worse are never considered to have
+Packages in ‘config-failed’ or worse are never considered to have
 lists of pending triggers.  A package whose postinst is being run
 can however acquire pending triggers during that run (ie, a package
 can trigger itself).
 
 This means that if a triggering package T awaits trigger processing by
-an interested package I, and I goes to `config-failed' or worse (eg,
+an interested package I, and I goes to ‘config-failed’ or worse (eg,
 during unpack for upgrade), then when I is reconfigured (goes to
-`installed') or removed, T will no longer await processing by I, so
-that T may automatically go from `triggers-awaited' to `installed'.
+‘installed’) or removed, T will no longer await processing by I, so
+that T may automatically go from ‘triggers-awaited’ to ‘installed’.
 
 Or to put it another way, triggered actions are considered irrelevant
 if the interested package I is not configured.  When I's postinst is
-called with `configure', it must do whatever actions are necessary to
+called with ‘configure’, it must do whatever actions are necessary to
 deal with any trigger activations which might have occurred while it
 was not configured, just as if the package was being configured for
 the first time.
@@ -208,18 +207,18 @@ the status database, rather than that when dpkg --status is run.)
 
 A package is only guaranteed to become notified of a trigger
 activation if it is continuously interested in the trigger, and never
-in `config-failed' or worse, during the period from when the trigger
+in ‘config-failed’ or worse, during the period from when the trigger
 is activated until dpkg runs the package postinst (either due to
 --configure --pending, or at the end of the relevant run, as described
 above).  Subsequent to activation and before notification, the
-interested package will not be considered in state `installed', so
+interested package will not be considered in state ‘installed’, so
 long as the package remains interested, and the triggering package
-will not be considered `installed'.
+will not be considered ‘installed’.
 
-If the package is not in state `installed', `triggers-pending' or
-`triggers-awaited' then pending triggers are not accumulated.
-However, if such a package (between `half-installed' and
-`config-failed' inclusive) declares some trigger interests then the
+If the package is not in state ‘installed’, ‘triggers-pending’ or
+‘triggers-awaited’ then pending triggers are not accumulated.
+However, if such a package (between ‘half-installed’ and
+‘config-failed’ inclusive) declares some trigger interests then the
 triggering packages *will* await their configuration (which implies
 completion of any necessary trigger processing) or removal.
 
@@ -230,8 +229,8 @@ have postinst trigger processing activating another package's triggers
 dpkg run).  Cycles in the triggering graph are prohibited and will
 eventually, perhaps after some looping, be detected by dpkg and cause
 trigger processing to fail; when this happens one of the packages
-involved will be put in state `config-failed' so that the trigger loop
-will not be reattempted.  See `Cycle detection' below.
+involved will be put in state ‘config-failed’ so that the trigger loop
+will not be reattempted.  See “Cycle detection” below.
 
 
 Explicit triggers
@@ -307,7 +306,7 @@ dpkg-generated triggers is as follows: a package which is interested
 in any unsupported trigger kinds cannot be configured (since such a
 package cannot be guaranteed to have these triggers properly activated
 by dpkg).  Therefore no package can be interested in any unsupported
-trigger kinds and they can be freely activated (both by `activate' and
+trigger kinds and they can be freely activated (both by ‘activate’ and
 by dpkg-trigger).  dpkg-deb will be changed to warn about unrecognised
 trigger names syntaxes and unrecognised trigger control directives.
 
@@ -349,18 +348,18 @@ needed, not the name of a file which would match the trigger.
 apt and aptitude
 ----------------
 
-These must be taught about the new `triggers-awaited' and
-`triggers-pending' states.  Packages in these states should be treated
-roughly like those in `unpacked': the remedy is to run dpkg
+These must be taught about the new ‘triggers-awaited’ and
+‘triggers-pending’ states.  Packages in these states should be treated
+roughly like those in ‘unpacked’: the remedy is to run dpkg
 --configure.
 
-Normally apt and aptitude will not see packages in `triggers-pending'
+Normally apt and aptitude will not see packages in ‘triggers-pending’
 since dpkg will generally attempt to run the triggers thus leaving the
-package in `config-failed' or `installed'.
+package in ‘config-failed’ or ‘installed’.
 
 Note that automatic package management tools which call dpkg (like apt
 and aptitude) should not attempt to configure individual packages in
-state `triggers-pending' (or indeed `triggers-awaited') with dpkg
+state ‘triggers-pending’ (or indeed ‘triggers-awaited’) with dpkg
 --triggers-only <package>... or dpkg --no-triggers --configure <package>...,
 or similar approaches. This might defeat dpkg's trigger cycle detection.
 
@@ -419,7 +418,7 @@ occurs at every relevant package installation, upgrade or removal.
 
 When triggers are available, this will work as follows:
 
- * gnome-foobar will ship its `omf' file in /usr/share/omf as
+ * gnome-foobar will ship its «omf» file in /usr/share/omf as
    normal, but will not contain any special machinery to invoke
    scrollkeeper.
 
@@ -459,7 +458,7 @@ Full implementation of the transition plan defined below, for
 scrollkeeper, goes like this:
 
  1. Update scrollkeeper:
-     - Add a `triggers' control archive file containing
+     - Add a ‘triggers’ control archive file containing
            interest /usr/share/omf
      - Make the postinst modifications as described above.
      - Rename scrollkeeper-update to scrollkeeper-update-now
@@ -471,7 +470,7 @@ scrollkeeper, goes like this:
 	   fi
 	   exec scrollkeeper-update-now "$@"
 
- 2. In gnome-policy chapter 2, `Use of scrollkeeper',
+ 2. In gnome-policy chapter 2, “Use of scrollkeeper”,
      - delete the requirement that the package must depend on
        scrollkeeper
      - delete the requirement that the package must invoke
@@ -485,7 +484,7 @@ scrollkeeper, goes like this:
 
          If an OMF file is placed, modified or removed other than as
          an file installed in the ordinary way by dpkg, the dpkg file
-         trigger `/usr/share/omf' should be activated; see the dpkg
+         trigger «/usr/share/omf» should be activated; see the dpkg
          triggers specification for details.
 
          Existing packages which Depend on scrollkeeper (>= 3.8)
@@ -549,9 +548,9 @@ pending and refuse.  (Since the new dpkg would be installed but then
 refuse to read the status file.)  In case this is necessary a separate
 tool will be provided which will:
   * Put all packages with any pending triggers into state
-    `config-failed' and remove the list of pending triggers.
+    ‘config-failed’ and remove the list of pending triggers.
   * Remove the list of awaited triggers from every package.  This
-    may cause packages to go from `triggers-awaited' to `installed'
+    may cause packages to go from ‘triggers-awaited’ to ‘installed’
     which is not 100% accurate but the best that can be done.
   * Remove /var/lib/dpkg/triggers (to put the situation to that which
     we would have seen if the trigger-supporting dpkg had never been
@@ -576,31 +575,31 @@ Transition hints for existing packages
 
 When a central (consumer) package defines a directory where other leaf
 (producer) packages may place files and/or directories, and currently
-the producer packages are required to run an `update-consumer' script
+the producer packages are required to run an «update-consumer» script
 in their postinst:
  1. In the relevant policy, define a trigger name which is the name of
     the directory where the individual files are placed by producer
     packages.
  2. Update the consumer package:
     * Declare an interest in the trigger.
-    * Edit update-consumer so that if it is called without --real
+    * Edit «update-consumer» so that if it is called without --real
       it does the following:
 	  if type dpkg-trigger >/dev/null 2>&1 && \
 	     dpkg-trigger name-of-trigger; then
 		exit 0
 	  fi
-      If this fails to cause update-consumer to exit, it should do
+      If this fails to cause «update-consumer» to exit, it should do
       its normal update processing.  Alternatively, if it is more
-      convenient, update-consumer could be renamed and supplanted with
+      convenient, «update-consumer» could be renamed and supplanted with
       a wrapper script which conditionally runs the real
-      update-consumer.
-    * In the postinst, arrange for the new `triggered' invocation to
-      run update-consumer --real.  The consumer package's postinst
-      will already run update-consumer during configuration, and this
+      «update-consumer».
+    * In the postinst, arrange for the new ‘triggered’ invocation to
+      run «update-consumer --real».  The consumer package's postinst
+      will already run «update-consumer» during configuration, and this
       should be retained and supplemented with the --real option (or
       changed to call the real script rather than the wrapper).
  3. Update the producer packages:
-    * In the postinst, remove the call to update-consumer
+    * In the postinst, remove the call to «update-consumer».
     * Change the dependency on consumer to be versioned, specifying a
       trigger-interested consumer.
     This can be done at our leisure.  Ideally for loosely coupled
@@ -608,11 +607,11 @@ in their postinst:
     containing the triggers-interested consumer, to facilitate partial
     upgrades and backports.
  4. After all producer packages have been updated according to step 3,
-    `update-consumer' has become an interface internal to the consumer
+    «update-consumer» has become an interface internal to the consumer
     and need no longer be kept stable.  If un-updated producers are
-    still of interest, incompatible changes to `update-consumer' imply
+    still of interest, incompatible changes to «update-consumer» imply
     a versioned Breaks against the old producers.
-(See also `Transition plan', below.)
+(See also “Transition plan”, below.)
 
 If there are several consumer packages all of which are interested in
 the features provided by producer packages, the current arrangements
@@ -627,7 +626,7 @@ emacsen-common).  In this case:
     consumers in step 3 (2nd bullet).
  3. Update the consumer packages:
     * Declare an interest in the trigger.
-    * In the postinst, arrange for the new `trigger' invocation to run
+    * In the postinst, arrange for the new ‘trigger’ invocation to run
       the compilation/registration process.  This may involve scanning
       for new or removed producers, and may involve new common
       functionality from the switchboard (in which case a versioned
@@ -716,7 +715,7 @@ a Triggers-Pending field which contains the space-separated names of
 the pending triggers.  For each package which awaits triggers the
 status file contains a Triggers-Awaited field which contains the
 *package* names of the packages whose trigger processing is awaited.
-See `Details - Overview table' above for the invariants which relate
+See “Details - Overview table” above for the invariants which relate
 Triggers-Pending, Triggers-Awaited, and Status.
 
 During dpkg's execution, /var/lib/dpkg/triggers/Unincorp is a list of
@@ -756,11 +755,11 @@ be parsed and /var/lib/dpkg/triggers/* updated accordingly.
 Triggers are run as part of configuration.  dpkg will try to first
 configure all packages which do not depend on packages which are
 awaiting triggers, and then run triggers one package at a time in the
-hope of making useful progress.  (This will involve a new `dependtry'
+hope of making useful progress.  (This will involve a new ‘dependtry’
 level in configure.c's algorithm.)  The only constraint on the
 ordering of postinsts is only the normal Depends constraint, so the
-usual Depends cycle breaking will function properly.  See `Cycle
-detection' below regarding cycles in the `A triggers B' relation.
+usual Depends cycle breaking will function properly.  See Cycle
+detection” below regarding cycles in the “A triggers B” relation.
 
 
 Processing - Transitional
@@ -770,9 +769,9 @@ The case where a triggers-supporting dpkg is run for the first time is
 detected by the absence of /var/lib/dpkg/triggers/Unincorp.  When the
 triggers-supporting dpkg starts up without this it will set each
 package's list of pending triggers equal to its interests (obviously
-only for packages which are in `installed' or `triggers-pending').
-This may result in a package going from `installed' to
-`triggers-pending' but it will not create the directory at this time.
+only for packages which are in ‘installed’ or ‘triggers-pending’).
+This may result in a package going from ‘installed’ to
+‘triggers-pending’ but it will not create the directory at this time.
 Packages marked as triggers-pending in this way will not be scheduled
 for trigger processing in this dpkg run.
 
@@ -794,7 +793,7 @@ Cycle detection
 
 In addition to dependency cycles, triggers raise the possibility of
 mutually triggering packages - a cycle detectable only dynamically,
-which we will call a `trigger cycle'.
+which we will call a “trigger cycle”.
 
 Trigger cycles are detected using the usual hare-and-tortoise
 approach.  Each time after dpkg runs a postinst for triggers, dpkg
@@ -811,6 +810,4 @@ all its (strict) subsets.  Trigger processing is supposed to
 monotonically decrease the set in this ordering.  (The set elements
 are <package, trigger name> tuples.)
 
-(See `Processing' above for discussion of dependency cycles.)
-
---
+(See “Processing” above for discussion of dependency cycles.)

+ 2 - 2
dselect/methods/Debian/Dselect/Ftp.pm

@@ -191,7 +191,7 @@ sub yesno($$) {
     $res =~ /^[Yy]/ and return 1;
     $res =~ /^[Nn]/ and return 0;
     $res =~ /^[ \t]*$/ and return $r;
-    print "Please enter one of the letters `y' or `n'\n";
+    print "Please enter one of the letters 'y' or 'n'\n";
   }
 }
 
@@ -246,7 +246,7 @@ sub do_connect {
 	    if(!$ftp->binary()) { print $ftp->message . "\n"; $exit=1; }
 	}
 	if (!$exit) {
-	    print "Cd to `$ftpdir'...\n";
+	    print "Cd to '$ftpdir'...\n";
 	    if(!$ftp->cwd($ftpdir)) { print $ftp->message . "\n"; $exit=1; }
 	}
 

+ 1 - 1
dselect/methods/disk/install

@@ -94,7 +94,7 @@ Perhaps you downloaded it with an unexpected name, or something.
 In any case, you must find the file(s) and then either place it with
 the correct filename(s) (as listed in the Packages file or in
 $vardir/available) and rerun the installation, or upgrade the
-package by using `dpkg --install --auto-deconfigure'\'' by hand.
+package by using '\''dpkg --install --auto-deconfigure'\'' by hand.
 
 ";
 				exit(1);

+ 28 - 28
dselect/methods/disk/setup

@@ -135,7 +135,7 @@ echo "
 If you make a mistake, use the interrupt key ($intrkey) to abort.
 "
 
-# State variables, `best first'
+# State variables, “best first”
 #  {main,ctb,nf,nus,lcl}_{packages,binary}
 #   Empty before we've found them or if they're not available,
 #   set to the relevant bit under mountpoint otherwise.
@@ -145,7 +145,7 @@ If you make a mistake, use the interrupt key ($intrkey) to abort.
 #  mountpoint
 #   The mountpoint for the filesystem containing the stuff
 #   empty or unset if we don't know yet, or if we haven't mounted anything;
-#   may also be empty if `directory' was set.
+#   may also be empty if ‘directory’ was set.
 #  blockdevice
 #   The actual block device to mount.
 #  fstype
@@ -175,7 +175,7 @@ then
 	'Several CD-ROMs (or other ISO9660 filesystems) are mounted:'
 			grep 'type iso9660 ([^)]*)$' <$tp.m | nl
 			echo -n \
-	'Is it any of these ?  Type a number, or `n'\'' for none.  '
+	"Is it any of these ?  Type a number, or 'n' for none.  "
 			read response
 			response="`echo \"$response\" | sed -e 's/[ 	]*$//'`"
 			if expr "$response" : '[0-9][0-9]*$' >/dev/null && \
@@ -347,7 +347,7 @@ distribution is (eg. 'dists/stable') - this directory usually contains the
 Packages-Master file.
 
 If the CD-ROM is badly organised and doesn't have a straightforward copy of
-the distribution you may answer \`none' and we'll go through the parts
+the distribution you may answer 'none' and we'll go through the parts
 I need individually."
 	else
 		echo \
@@ -358,7 +358,7 @@ distribution is (eg. 'debian/dists/stable') - this directory usually
 contains the Packages-Master file.
 
 If you do not have a straightforward copy of the distribution available
-just answer \`none' and we'll go through the parts I need individually."
+just answer 'none' and we'll go through the parts I need individually."
 	fi
 	defhierbase=none
 # maybe ask for debian/dists and then show and ask for available dists 
@@ -368,12 +368,12 @@ just answer \`none' and we'll go through the parts I need individually."
 		if [ -d "$mountpoint/$p_hierbase/main/binary-$iarch" ]
 		then
 			echo "
-Last time you said \`$p_hierbase', and that looks plausible."
+Last time you said '$p_hierbase', and that looks plausible."
 			defhierbase="$p_hierbase"
 		else
 			echo "
-Last time you said \`$p_hierbase', but that doesn't look plausible,
-since \`$p_hierbase/main/binary-$iarch' doesn't seem to exist."
+Last time you said '$p_hierbase', but that doesn't look plausible,
+since '$p_hierbase/main/binary-$iarch' doesn't seem to exist."
 		fi
 	fi
 	if [ none = "$defhierbase" ]
@@ -381,12 +381,12 @@ since \`$p_hierbase/main/binary-$iarch' doesn't seem to exist."
 		if [ -d "$mountpoint/debian/dists/stable/main/binary-$iarch" ]
 		then
 			echo "
-\`/debian/dists/stable' exists and looks plausible, so that's the default."
+'/debian/dists/stable' exists and looks plausible, so that's the default."
 			defhierbase=/debian/dists/stable
 		elif [ -d "$mountpoint/dists/stable/main/binary-$iarch" ]
 		then
 			echo "
-\`/dists/stable' exists and looks plausible, so that's the default."
+'/dists/stable' exists and looks plausible, so that's the default."
 			defhierbase=/dists/stable
 		fi
 	fi
@@ -424,17 +424,17 @@ check_binary () {
 	# checks wether $2 contains *.deb
 	if ! [ -d "$mountpoint$2/" ]
 	then
-		echo "\`$2' does not exist."
+		echo "'$2' does not exist."
 		return
 	fi
 
 	if ! ( find -L "$mountpoint$2/" -name '*.deb' -print \
 	        | head -n 1 ) 2>/dev/null  | grep . >/dev/null
 	then
-		echo "\`$2' does not contain any *.deb packages.  Hmmpf."
+		echo "'$2' does not contain any *.deb packages.  Hmmpf."
 		return
 	fi
-	echo "Using \`$2' as $1 binary dir."
+	echo "Using '$2' as $1 binary dir."
 	this_binary="$2"
 }
 
@@ -453,26 +453,26 @@ find_area () {
 
 	if [ $option = cdrom ] && [ $2 = nf ] && [ -z "$this_binary" ]
 	then
-		echo '
+		echo "
 Note: most CD-ROM distributions of Debian do not include programs
-available in the `non-free'\'' directory of the distribution site.
+available in the 'non-free' directory of the distribution site.
 This is because these programs have copyrights that prevent
 distribution for profit on a CD-ROM - ie they are not free software.
-If you wish to install these programs you'\''ll have to get them from an
-alternative source.'
+If you wish to install these programs you'll have to get them from an
+alternative source."
 	elif [ $2 = lcl ] && [ -z "$this_binary" ]
 	then
-		echo '
-Note: By default there is no `local'\'' directory. It is intended for 
-packages you made yourself.'
+		echo "
+Note: By default there is no 'local' directory. It is intended for
+packages you made yourself."
 	fi
 	while [ -z "$this_binary" ]
 	do
 		defaultbinary="$4"
 		echo "
 Which directory contains the *.deb packages from the $1 distribution
-area (this directory is named \`$3/binary-$iarch' on the distribution site) ?
-Say \`none' if this area is not available."
+area (this directory is named '$3/binary-$iarch' on the distribution site) ?
+Say 'none' if this area is not available."
 		if [ $2 != main ] && [ -z "$defaultbinary" ]
 		then
 			defaultbinary=none
@@ -500,7 +500,7 @@ Say \`none' if this area is not available."
 		do
 			if [ -f "$mountpoint/$this_binary/$f" ]
 			then
-				echo "Using \`$this_binary/$f' for $1."
+				echo "Using '$this_binary/$f' for $1."
 				this_packages="$this_binary/$f"
 				break
 			fi
@@ -508,21 +508,21 @@ Say \`none' if this area is not available."
 		while [ -z "$this_packages" ]
 		do
 			echo -n "
-I can't find the $1 \`Packages' file.  The information in the
-\`Packages' file is important for package selection during new
+I can't find the $1 'Packages' file.  The information in the
+'Packages' file is important for package selection during new
 installations, and is very useful for upgrades.
 
 If you overlooked it when downloading you should do get it now and
 return to this installation procedure when you have done so: you will
 find one Packages file and one Packages.gz file -- either will do --
-in the \`binary-$iarch' subdirectory of each area on the FTP sites and
+in the 'binary-$iarch' subdirectory of each area on the FTP sites and
 CD-ROMs.  Alternatively (and this will be rather slow) I can scan the
-packages in the distribution area - say \`scan' if you want me to do so.
+packages in the distribution area - say 'scan' if you want me to do so.
 
 You need a separate Packages file from each of the distribution areas
 you wish to install.
 
-Where is the _$1_ \`Packages' file (if none is available, say \`none')
+Where is the _$1_ 'Packages' file (if none is available, say 'none')
 [$5]
  ?  "
 			read response

+ 1 - 1
dselect/methods/floppy/desc.floppy

@@ -2,7 +2,7 @@ Installation using a pile of floppies, at least one of which (usually
 the first) contains the Packages file, and the rest of which contain
 the binary *.deb files.
 
-If you are installing software from the `non-free' or `contrib'
+If you are installing software from the 'non-free' or 'contrib'
 directories as well as the main Debian distribution you must have the
 Packages files for those areas on separate floppies.  The usual way to
 do this is to put each Packages file on the first floppy which contains

+ 15 - 15
dselect/methods/multicd/README.multicd

@@ -17,8 +17,8 @@ Installation methods for multiple binary CDs
 Acquiring package data
 ---------------------
 
- Since this method is derived from the `mounted' method the user is
- able to access up to five binary directories within `dists/stable':
+ Since this method is derived from the 'mounted' method the user is
+ able to access up to five binary directories within 'dists/stable':
 
   . main
   . contrib
@@ -26,7 +26,7 @@ Acquiring package data
   . non-US
   . local
 
- The selected method will try to read the `Packages.cd' file from each
+ The selected method will try to read the 'Packages.cd' file from each
  of these directories if it is available.
 
 Identifying the CD-ROM
@@ -40,7 +40,7 @@ Identifying the CD-ROM
 Installing the files
 --------------------
 
- At the beginning of the installation the `multicd' package will sort
+ At the beginning of the installation the 'multicd' package will sort
  the list of to-be-installed packages and install them CD by CD.  If a
  different CD-ROM is required the user will be prompted to exchange
  the CD-ROM.
@@ -48,26 +48,26 @@ Installing the files
 Preparing multiple binary CD-ROMs
 ---------------------------------
 
- Since the `multicd' methods need to know which packages are on which
- CD-ROMs one cannot use regular `Packages' files.  An additional data
+ Since the 'multicd' methods need to know which packages are on which
+ CD-ROMs one cannot use regular 'Packages' files.  An additional data
  field "X-Medium:" is required.  The first CD-ROM from the set should
- contain all `Packages.cd' files.  To be more convenient you should
- include the `Packages.cd' files on all CD-ROMs.  This ensures that
+ contain all 'Packages.cd' files.  To be more convenient you should
+ include the 'Packages.cd' files on all CD-ROMs.  This ensures that
  you don't have to start with the first CD-ROM all the time.
 
  Additionally the package needs to gain information which CD-ROM is
- currently used.  Thus each CD-ROM contains the file `.disk/info'
+ currently used.  Thus each CD-ROM contains the file '.disk/info'
  which contains the symbolic name for the CD-ROM as specified by
  "X-Medium:".
 
- In order to be able to create the modified `Packages.cd' files, you
- have to use the `-M medium' option of dpkg-scanpackages (supported
+ In order to be able to create the modified 'Packages.cd' files, you
+ have to use the '-M medium' option of dpkg-scanpackages (supported
  in dpkg-dev >= 1.15.5).
 
- To split the `main' distribution into two CD-ROMs you'll need to
- create a `Packages.cd' file for each `binary-$arch' directory.
+ To split the 'main' distribution into two CD-ROMs you'll need to
+ create a 'Packages.cd' file for each 'binary-$arch' directory.
  Afterwards you simply append the second one to the first one and
- put the resulting `Packages.cd' file into both `binary-$arch'
+ put the resulting 'Packages.cd' file into both 'binary-$arch'
  directories.
 
 Sample Layout
@@ -98,7 +98,7 @@ Sample Layout
                   non-US/binary-all/
 
  To re-generate the Packages file you have to chdir into
- `dists/stable/$part' and issue `dpkg-scanpackages' as follows.  It's
+ 'dists/stable/$part' and issue 'dpkg-scanpackages' as follows.  It's
  assumed that you use regular compressed overrides files in
  /pub/debian/indices.
 

+ 29 - 29
dselect/methods/multicd/setup

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# The `multicd' package was initially written by Heiko Schlittermann
+# The ‘multicd’ package was initially written by Heiko Schlittermann
 # <heiko@lotte.sax.de> based on builtin access methods written by Ian
 # Jackson <ian@chiark.greenend.org.uk>.  The final packaging as well as
 # cleanups were made by Martin Schulze <joey@infodrom.north.de> who also
@@ -175,7 +175,7 @@ echo "
 If you make a mistake, use the interrupt key ($intrkey) to abort.
 "
 
-# State variables, `best first'
+# State variables, “best first”
 #  {main,ctb,nf,nonus,nonusctb,nonusnf,lcl}_{packages,binary}
 #   Empty before we've found them or if they're not available,
 #   set to the relevant bit under mountpoint otherwise.
@@ -184,7 +184,7 @@ If you make a mistake, use the interrupt key ($intrkey) to abort.
 #  mountpoint
 #   The mountpoint for the filesystem containing the stuff
 #   empty or unset if we don't know yet, or if we haven't mounted anything;
-#   may also be empty if `directory' was set.
+#   may also be empty if ‘directory’ was set.
 #  blockdevice
 #   The actual block device to mount.
 #  fstype
@@ -216,7 +216,7 @@ then
 	'Several CD-ROMs (or other ISO9660 filesystems) are mounted:'
 			egrep 'type iso9660 \([^)]*\)$' <$tp.m | nl
 			echo -n \
-	'Is it any of these ?  Type a number, or `n'\'' for none.  '
+	"Is it any of these ?  Type a number, or 'n' for none.  "
 			read response
 			response="`echo \"$response\" | sed -e 's/[ 	]*$//'`"
 			if expr "$response" : '[0-9][0-9]*$' >/dev/null && \
@@ -392,10 +392,10 @@ do
 	then
 		echo \
 "I would like to know where on the CD-ROM the top level of the Debian
-distribution is - this will usually contain the \`dists' directory.
+distribution is - this will usually contain the 'dists' directory.
 
 If the CD-ROM is badly organized and doesn't have a straightforward copy of
-the distribution you may answer \`none' and we'll go through the parts
+the distribution you may answer 'none' and we'll go through the parts
 I need individually."
 	else
 		echo \
@@ -405,29 +405,29 @@ To use this I'll need to know where the top level of that copy of the
 distribution is - this directory usually contains the Packages-Master file.
 
 If you do not have a straightforward copy of the distribution available
-just answer \`none' and we'll go through the parts I need individually."
+just answer 'none' and we'll go through the parts I need individually."
 	fi
 
 	defhierbase=none
 	if [ -n "$p_hierbase" ]; then
 		if [ -d "$mountpoint/$p_hierbase/dists/$dist/main/binary-$iarch" \
 			-o -n "$multi" ]; then
-			echo "Last time you said \`$p_hierbase', and that looks plausible."
+			echo "Last time you said '$p_hierbase', and that looks plausible."
 			defhierbase="$p_hierbase"
 		else
 			echo "
-Last time you said \`$p_hierbase', but that doesn't look plausible,
-since \`$p_hierbase/dists/$dist/main/binary-$iarch' doesn't seem to exist.
+Last time you said '$p_hierbase', but that doesn't look plausible,
+since '$p_hierbase/dists/$dist/main/binary-$iarch' doesn't seem to exist.
 And I can't get the impression that you're using a multi-CD  set."
 		fi
 	fi
 
 	# at this point defhierbase is set if it looks plausible
-	# if `none' was entered, we assume a CD with a debian/ directory
+	# if ‘none’ was entered, we assume a CD with a debian/ directory
 
 	if [ none = "$defhierbase" -a -d "$mountpoint/debian/dists/$dist/main/binary-$iarch" ]
 	then
-		echo "\`/debian' exists and looks plausible, so that's the default."
+		echo "'/debian' exists and looks plausible, so that's the default."
 		defhierbase=/debian
 	fi
 
@@ -499,7 +499,7 @@ check_binary () {
 
 	if [ ! -d "${mountpoint}$2" -a -z "$multi" ]
 	then
-		echo "\`$2' does not exist."
+		echo "'$2' does not exist."
 		return
 	fi
 
@@ -510,17 +510,17 @@ check_binary () {
 #  	if ! { find -L "$mountpoint$2" -name '*.deb' -print \
 #  		| head -1 | grep . ; } >/dev/null 2>&1 && [ -z "$multi" ];
 #  	then
-#  		echo "\`$2' does not contain any *.deb packages."
+#  		echo "'$2' does not contain any *.deb packages."
 #  		return
 #  	fi
 
 	this_binary="$2"
-	echo -n "Using \`$this_binary' as $1 binary dir"
+	echo -n "Using '$this_binary' as $1 binary dir"
 
 	if [ -n "$multi" ]; then
 		this_disk=`getdisklabel ${mountpoint} "/$hierbase"`
 		echo " from disc"
-		echo "    \`$this_disk'"
+		echo "    '$this_disk'"
 	else
 		echo ""
 	fi
@@ -540,21 +540,21 @@ find_area () {
 	fi
 	if [ $option = multi_cd -a $2 = nf -a -z "$this_binary" ]
 	then
-		echo '
+		echo "
 Note: most CD-ROM distributions of Debian do not include programs
-available in the `non-free'\'' directory of the distribution site.
+available in the 'non-free' directory of the distribution site.
 This is because these programs have copyrights that prevent
 distribution for profit on a CD-ROM - ie they are not free software.
-If you wish to install these programs you'\''ll have to get them from an
-alternative source.'
+If you wish to install these programs you'll have to get them from an
+alternative source."
 	fi
 	while [ -z "$this_binary" ]
 	do
 		defaultbinary="$4"
 		echo "
 Which directory contains the *.deb packages from the $1 distribution
-area (this directory is named \`$3/binary' on the distribution site) ?
-Say \`none' if this area is not available."
+area (this directory is named '$3/binary' on the distribution site) ?
+Say 'none' if this area is not available."
 		if [ $2 != main -a -z "$defaultbinary" ]
 		then
 			defaultbinary=none
@@ -584,34 +584,34 @@ Say \`none' if this area is not available."
 				if [ -f "$mountpoint/$this_binary/$f" ]
 				then
 					this_packages="$this_binary/$f"
-					echo "Using \`$this_packages' for $1."
+					echo "Using '$this_packages' for $1."
 					break
 				fi
 			done
 		else
 			if [ -f "${mountpoint}${hierbase}/.disk/packages/$1/Packages.gz" ]; then
 				this_packages=`echo "${hierbase}/.disk/packages/$1/Packages.gz"|sed 's:/\+:/:g'`
-				echo "Using \`${this_packages}' for $1."
+				echo "Using '${this_packages}' for $1."
 			fi
 		fi
 		while [ -z "$this_packages" ]
 		do
 			echo -n "
-I can't find the $1 \`Packages.cd' file.  The information in the
-\`Packages.cd' file is important for package selection during new
+I can't find the $1 'Packages.cd' file.  The information in the
+'Packages.cd' file is important for package selection during new
 installations, and is very useful for upgrades.
 
 If you overlooked it when downloading you should do get it now and
 return to this installation procedure when you have done so: you will
 find one Packages.cd file and one Packages.cd.gz file -- either will do --
-in the \`binary' subdirectory of each area on the FTP sites and
+in the 'binary' subdirectory of each area on the FTP sites and
 CD-ROMs.  Alternatively (and this will be rather slow) I can scan the
-packages in the distribution area - say \`scan' if you want me to do so.
+packages in the distribution area - say 'scan' if you want me to do so.
 
 You need a separate Packages.cd file from each of the distribution areas
 you wish to install.
 
-Where is the _$1_ \`Packages.cd' file (if none is available, say \`none')
+Where is the _$1_ 'Packages.cd' file (if none is available, say 'none')
 [$5]
  ?  "
 			read response

+ 2 - 2
dselect/pkgdepcon.cc

@@ -75,7 +75,7 @@ int packagelist::checkdependers(pkginfo *pkg, int changemade) {
 
 int packagelist::resolvesuggest() {
   // We continually go around looking for things to change, but we may
-  // only change the `suggested' value if we also increase the `priority'
+  // only change the ‘suggested’ value if we also increase the ‘priority’
   // Return 2 if we made a change due to a Recommended, Depends or Conficts,
   // or 1 if we offered or made a change because of an Optional line.
   debug(dbg_general, "packagelist[%p]::resolvesuggest()", this);
@@ -365,7 +365,7 @@ int packagelist::resolvedepcon(dependency *depends) {
 bool
 packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade)
 {
-  // `satisfied' here for Conflicts and Breaks means that the
+  // ‘satisfied’ here for Conflicts and Breaks means that the
   //  restriction is violated ie that the target package is wanted
   int would;
   pkginfo::pkgwant want= pkginfo::want_purge;

+ 3 - 3
dselect/pkglist.h

@@ -38,7 +38,7 @@ enum selpriority {
   sp_inherit,     // inherited from our parent list
   sp_selecting,   // propagating a selection
   sp_deselecting, // propagating a deselection
-  sp_fixed        // it came from the `status' file and we're not a recursive list
+  sp_fixed        // it came from the ‘status’ file and we're not a recursive list
   // high
 };
 
@@ -63,7 +63,7 @@ enum ssstateval {      // State sorting order, first to last:
 
 struct perpackagestate {
   struct pkginfo *pkg;
-  /* The `heading' entries in the list, for `all packages of type foo',
+  /* The ‘heading’ entries in the list, for “all packages of type foo”,
    * point to a made-up pkginfo, which has pkg->name==0.
    * pkg->priority and pkg->section are set to the values if appropriate, or to
    * pri_unset resp. null if the heading refers to all priorities resp. sections.
@@ -91,7 +91,7 @@ protected:
   int section_column, priority_column, versioninstalled_column;
   int versionavailable_column, package_column, description_column;
 
-  // Only used when `verbose' is set
+  // Only used when ‘verbose’ is set
   int status_hold_width, status_status_width, status_want_width;
 
   // Table of packages

+ 4 - 4
src/archives.c

@@ -121,7 +121,7 @@ filesavespackage(struct fileinlist *file,
   struct pkgset *divpkgset;
   struct pkginfo *thirdpkg;
 
-  debug(dbg_eachfiledetail,"filesavespackage file `%s' package %s",
+  debug(dbg_eachfiledetail, "filesavespackage file '%s' package %s",
         file->namenode->name, pkg_name(pkgtobesaved, pnaw_always));
 
   /* If the file is a contended one and it's overridden by either
@@ -579,7 +579,7 @@ void setupfnamevbs(const char *filename) {
   varbuf_add_str(&fnamenewvb, DPKGNEWEXT);
   varbuf_end_str(&fnamenewvb);
 
-  debug(dbg_eachfiledetail, "setupvnamevbs main=`%s' tmp=`%s' new=`%s'",
+  debug(dbg_eachfiledetail, "setupvnamevbs main='%s' tmp='%s' new='%s'",
         fnamevb.buf, fnametmpvb.buf, fnamenewvb.buf);
 }
 
@@ -756,7 +756,7 @@ tarobject(void *ctx, struct tar_entry *ti)
      * version (i.e. we do the usual link-following). */
     if (conffderef(tc->pkg, &conffderefn, usename))
       usename= conffderefn.buf;
-    debug(dbg_conff,"tarobject fnnf_new_conff deref=`%s'",usename);
+    debug(dbg_conff, "tarobject fnnf_new_conff deref='%s'", usename);
   }
 
   setupfnamevbs(usename);
@@ -1060,7 +1060,7 @@ tarobject(void *ctx, struct tar_entry *ti)
         ohshite(_("unable to chown backup symlink for `%.255s'"), ti->name);
       tarobject_set_se_context(fnamevb.buf, fnametmpvb.buf, stab.st_mode);
     } else {
-      debug(dbg_eachfiledetail,"tarobject nondirectory, `link' backup");
+      debug(dbg_eachfiledetail, "tarobject nondirectory, 'link' backup");
       if (link(fnamevb.buf,fnametmpvb.buf))
         ohshite(_("unable to make backup link of `%.255s' before installing new version"),
                 ti->name);

+ 2 - 1
src/cleanup.c

@@ -71,7 +71,8 @@ void cu_installnew(int argc, void **argv) {
 
   cleanup_pkg_failed++; cleanup_conflictor_failed++;
 
-  debug(dbg_eachfile,"cu_installnew `%s' flags=%o",namenode->name,namenode->flags);
+  debug(dbg_eachfile, "cu_installnew '%s' flags=%o",
+        namenode->name, namenode->flags);
 
   setupfnamevbs(namenode->name);
 

+ 6 - 5
src/help.c

@@ -68,7 +68,7 @@ namenodetouse(struct filenamenode *namenode, struct pkginfo *pkg,
     return r;
   }
 
-  debug(dbg_eachfile,"namenodetouse namenode=`%s' pkg=%s",
+  debug(dbg_eachfile, "namenodetouse namenode='%s' pkg=%s",
         namenode->name, pkgbin_name(pkg, pkgbin, pnaw_always));
 
   r=
@@ -402,7 +402,8 @@ maintainer_script_new(struct pkginfo *pkg,
   if (stat(cidir,&stab)) {
     command_destroy(&cmd);
     if (errno == ENOENT) {
-      debug(dbg_scripts,"maintainer_script_new nonexistent %s `%s'",scriptname,cidir);
+      debug(dbg_scripts, "maintainer_script_new nonexistent %s '%s'",
+            scriptname, cidir);
       return 0;
     }
     ohshite(_("unable to stat %s `%.250s'"), buf, cidir);
@@ -434,7 +435,7 @@ int maintainer_script_alternative(struct pkginfo *pkg,
 
   if (stat(oldscriptpath,&stab)) {
     if (errno == ENOENT) {
-      debug(dbg_scripts,"maintainer_script_alternative nonexistent %s `%s'",
+      debug(dbg_scripts, "maintainer_script_alternative nonexistent %s '%s'",
             scriptname,oldscriptpath);
       command_destroy(&cmd);
       return 0;
@@ -582,7 +583,7 @@ void oldconffsetflags(const struct conffile *searchconff) {
     namenode->flags |= fnnf_old_conff;
     if (!namenode->oldhash)
       namenode->oldhash= searchconff->hash;
-    debug(dbg_conffdetail, "oldconffsetflags `%s' namenode %p flags %o",
+    debug(dbg_conffdetail, "oldconffsetflags '%s' namenode %p flags %o",
           searchconff->name, namenode, namenode->flags);
     searchconff= searchconff->next;
   }
@@ -627,7 +628,7 @@ void ensure_pathname_nonexisting(const char *pathname) {
   u = path_skip_slash_dotslash(pathname);
   assert(*u);
 
-  debug(dbg_eachfile,"ensure_pathname_nonexisting `%s'",pathname);
+  debug(dbg_eachfile, "ensure_pathname_nonexisting '%s'", pathname);
   if (!rmdir(pathname))
     return; /* Deleted it OK, it was a directory. */
   if (errno == ENOENT || errno == ELOOP) return;

+ 10 - 10
src/processarc.c

@@ -286,7 +286,7 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
     const char *newinfofilename;
 
     if (strchr(de->d_name, '.')) {
-      debug(dbg_scripts,"process_archive tmp.ci script/file `%s' contains dot",
+      debug(dbg_scripts, "process_archive tmp.ci script/file '%s' contains dot",
             de->d_name);
       continue;
     }
@@ -305,7 +305,7 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
 
     /* Ignore the control file. */
     if (strcmp(de->d_name, CONTROLFILE) == 0) {
-      debug(dbg_scripts, "process_archive tmp.ci script/file `%s' is control",
+      debug(dbg_scripts, "process_archive tmp.ci script/file '%s' is control",
             cidir);
       continue;
     }
@@ -322,7 +322,7 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
               cidir, newinfofilename);
 
     debug(dbg_scripts,
-          "process_archive tmp.ci script/file `%s' installed as `%s'",
+          "process_archive tmp.ci script/file '%s' installed as '%s'",
           cidir, newinfofilename);
   }
   pop_cleanup(ehflag_normaltidy); /* closedir */
@@ -664,18 +664,18 @@ void process_archive(const char *filename) {
       iter = filepackages_iter_new(newconff->namenode);
       while ((otherpkg = filepackages_iter_next(iter))) {
         debug(dbg_conffdetail,
-              "process_archive conffile `%s' in package %s - conff ?",
+              "process_archive conffile '%s' in package %s - conff ?",
               newconff->namenode->name, pkg_name(otherpkg, pnaw_always));
         for (searchconff = otherpkg->installed.conffiles;
              searchconff && strcmp(newconff->namenode->name, searchconff->name);
              searchconff = searchconff->next)
           debug(dbg_conffdetail,
-                "process_archive conffile `%s' in package %s - conff ? not `%s'",
+                "process_archive conffile '%s' in package %s - conff ? not '%s'",
                 newconff->namenode->name, pkg_name(otherpkg, pnaw_always),
                 searchconff->name);
         if (searchconff) {
           debug(dbg_conff,
-                "process_archive conffile `%s' package=%s %s hash=%s",
+                "process_archive conffile '%s' package=%s %s hash=%s",
                 newconff->namenode->name, pkg_name(otherpkg, pnaw_always),
                 otherpkg == pkg ? "same" : "different!",
                 searchconff->hash);
@@ -689,7 +689,7 @@ void process_archive(const char *filename) {
         newconff->namenode->oldhash= searchconff->hash;
 	/* We don't copy ‘obsolete’; it's not obsolete in the new package. */
       } else {
-        debug(dbg_conff,"process_archive conffile `%s' no package, no hash",
+        debug(dbg_conff, "process_archive conffile '%s' no package, no hash",
               newconff->namenode->name);
       }
       newconff->namenode->flags |= fnnf_new_conff;
@@ -1323,17 +1323,17 @@ void process_archive(const char *filename) {
       divpkgset = cfile->namenode->divert->pkgset;
       if (divpkgset == pkg->set) {
         debug(dbg_eachfile,
-              "process_archive not overwriting any `%s' (overriding, `%s')",
+              "process_archive not overwriting any '%s' (overriding, '%s')",
               cfile->namenode->name, cfile->namenode->divert->useinstead->name);
         continue;
       } else {
         debug(dbg_eachfile,
-              "process_archive looking for overwriting `%s' (overridden by %s)",
+              "process_archive looking for overwriting '%s' (overridden by %s)",
               cfile->namenode->name, divpkgset ? divpkgset->name : "<local>");
       }
     } else {
       divpkgset = NULL;
-      debug(dbg_eachfile, "process_archive looking for overwriting `%s'",
+      debug(dbg_eachfile, "process_archive looking for overwriting '%s'",
             cfile->namenode->name);
     }
     iter = filepackages_iter_new(cfile->namenode);

+ 22 - 19
src/remove.c

@@ -59,7 +59,7 @@ static void checkforremoval(struct pkginfo *pkgtoremove,
   for (possi = pkgdepcheck->depended.installed; possi; possi = possi->rev_next) {
     if (possi->up->type != dep_depends && possi->up->type != dep_predepends) continue;
     depender= possi->up->up;
-    debug(dbg_depcon, "checking depending package `%s'",
+    debug(dbg_depcon, "checking depending package '%s'",
           pkg_name(depender, pnaw_always));
     if (!(depender->status == stat_installed ||
           depender->status == stat_triggerspending ||
@@ -116,13 +116,13 @@ void deferred_remove(struct pkginfo *pkg) {
   }
   if (!f_noact) modstatdb_note(pkg);
 
-  debug(dbg_general, "checking dependencies for remove `%s'",
+  debug(dbg_general, "checking dependencies for remove '%s'",
         pkg_name(pkg, pnaw_always));
   rok= 2;
   checkforremoval(pkg, pkg->set, &rok, &raemsgs);
   for (dep= pkg->installed.depends; dep; dep= dep->next) {
     if (dep->type != dep_provides) continue;
-    debug(dbg_depcon,"checking virtual package `%s'",dep->list->ed->name);
+    debug(dbg_depcon, "checking virtual package '%s'", dep->list->ed->name);
     checkforremoval(pkg, dep->list->ed, &rok, &raemsgs);
   }
 
@@ -257,7 +257,7 @@ removal_bulk_remove_files(struct pkginfo *pkg)
       struct filenamenode *usenode;
       bool is_dir;
 
-      debug(dbg_eachfile, "removal_bulk `%s' flags=%o",
+      debug(dbg_eachfile, "removal_bulk '%s' flags=%o",
             namenode->name, namenode->flags);
 
       usenode = namenodetouse(namenode, pkg, &pkg->installed);
@@ -287,14 +287,14 @@ removal_bulk_remove_files(struct pkginfo *pkg)
       varbuf_trunc(&fnvb, before);
       varbuf_add_str(&fnvb, DPKGTEMPEXT);
       varbuf_end_str(&fnvb);
-      debug(dbg_eachfiledetail, "removal_bulk cleaning temp `%s'", fnvb.buf);
+      debug(dbg_eachfiledetail, "removal_bulk cleaning temp '%s'", fnvb.buf);
 
       ensure_pathname_nonexisting(fnvb.buf);
 
       varbuf_trunc(&fnvb, before);
       varbuf_add_str(&fnvb, DPKGNEWEXT);
       varbuf_end_str(&fnvb);
-      debug(dbg_eachfiledetail, "removal_bulk cleaning new `%s'", fnvb.buf);
+      debug(dbg_eachfiledetail, "removal_bulk cleaning new '%s'", fnvb.buf);
       ensure_pathname_nonexisting(fnvb.buf);
 
       varbuf_trunc(&fnvb, before);
@@ -315,10 +315,11 @@ removal_bulk_remove_files(struct pkginfo *pkg)
         if (dir_is_used_by_others(namenode, pkg))
           continue;
       }
-      debug(dbg_eachfiledetail, "removal_bulk removing `%s'", fnvb.buf);
+      debug(dbg_eachfiledetail, "removal_bulk removing '%s'", fnvb.buf);
       if (!rmdir(fnvb.buf) || errno == ENOENT || errno == ELOOP) continue;
       if (errno == ENOTEMPTY || errno == EEXIST) {
-	debug(dbg_eachfiledetail, "removal_bulk `%s' was not empty, will try again later",
+        debug(dbg_eachfiledetail,
+              "removal_bulk '%s' was not empty, will try again later",
 	      fnvb.buf);
         push_leftover(&leftover,namenode);
         continue;
@@ -335,7 +336,7 @@ removal_bulk_remove_files(struct pkginfo *pkg)
         continue;
       }
       if (errno != ENOTDIR) ohshite(_("cannot remove `%.250s'"),fnvb.buf);
-      debug(dbg_eachfiledetail, "removal_bulk unlinking `%s'", fnvb.buf);
+      debug(dbg_eachfiledetail, "removal_bulk unlinking '%s'", fnvb.buf);
       if (secure_unlink(fnvb.buf))
         ohshite(_("unable to securely remove '%.250s'"), fnvb.buf);
     }
@@ -375,7 +376,7 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) {
   while ((namenode= reversefilelist_next(&rlistit))) {
     struct filenamenode *usenode;
 
-    debug(dbg_eachfile, "removal_bulk `%s' flags=%o",
+    debug(dbg_eachfile, "removal_bulk '%s' flags=%o",
           namenode->name, namenode->flags);
     if (namenode->flags & fnnf_old_conff) {
       /* This can only happen if removal_bulk_remove_configfiles() got
@@ -406,7 +407,7 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) {
         continue;
     }
 
-    debug(dbg_eachfiledetail, "removal_bulk removing `%s'", fnvb.buf);
+    debug(dbg_eachfiledetail, "removal_bulk removing '%s'", fnvb.buf);
     if (!rmdir(fnvb.buf) || errno == ENOENT || errno == ELOOP) continue;
     if (errno == ENOTEMPTY || errno == EEXIST) {
       warning(_("while removing %.250s, directory '%.250s' not empty so not removed."),
@@ -478,7 +479,8 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
            searchfile && strcmp(searchfile->namenode->name,conff->name);
            searchfile= searchfile->next);
       if (!searchfile) {
-        debug(dbg_conff,"removal_bulk conffile not ours any more `%s'",conff->name);
+        debug(dbg_conff, "removal_bulk conffile not ours any more '%s'",
+              conff->name);
         *lconffp= conff->next;
       } else if (searchfile->namenode->divert &&
                  (searchfile->namenode->divert->camefrom ||
@@ -488,7 +490,8 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
               conff->name);
         *lconffp= conff->next;
       } else {
-        debug(dbg_conffdetail,"removal_bulk set to new conffile `%s'",conff->name);
+        debug(dbg_conffdetail, "removal_bulk set to new conffile '%s'",
+              conff->name);
         conff->hash = NEWCONFFILEFLAG;
         lconffp= &conff->next;
       }
@@ -503,7 +506,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
       }
       varbuf_reset(&fnvb);
       r= conffderef(pkg, &fnvb, conff->name);
-      debug(dbg_conffdetail, "removal_bulk conffile `%s' (= `%s')",
+      debug(dbg_conffdetail, "removal_bulk conffile '%s' (= '%s')",
             conff->name, r == -1 ? "<r==-1>" : fnvb.buf);
       if (r == -1) continue;
       conffnameused = fnvb.used;
@@ -532,8 +535,8 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
       conffbasenamelen= strlen(++p);
       conffbasename= fnvb.buf+conffnameused-conffbasenamelen;
       while ((de = readdir(dsd)) != NULL) {
-        debug(dbg_stupidlyverbose, "removal_bulk conffile dsd entry=`%s'"
-              " conffbasename=`%s' conffnameused=%d conffbasenamelen=%d",
+        debug(dbg_stupidlyverbose, "removal_bulk conffile dsd entry='%s'"
+              " conffbasename='%s' conffnameused=%d conffbasenamelen=%d",
               de->d_name, conffbasename, conffnameused, conffbasenamelen);
         if (!strncmp(de->d_name,conffbasename,conffbasenamelen)) {
           debug(dbg_stupidlyverbose, "removal_bulk conffile dsd entry starts right");
@@ -556,7 +559,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
         varbuf_trunc(&removevb, removevbbase);
         varbuf_add_str(&removevb, de->d_name);
         varbuf_end_str(&removevb);
-        debug(dbg_conffdetail, "removal_bulk conffile dsd entry removing `%s'",
+        debug(dbg_conffdetail, "removal_bulk conffile dsd entry removing '%s'",
               removevb.buf);
         if (unlink(removevb.buf) && errno != ENOENT && errno != ENOTDIR)
           ohshite(_("cannot remove old backup config file `%.250s' (of `%.250s')"),
@@ -615,13 +618,13 @@ void removal_bulk(struct pkginfo *pkg) {
     removal_bulk_remove_leftover_dirs(pkg);
 
     filename = pkgadminfile(pkg, &pkg->installed, LISTFILE);
-    debug(dbg_general, "removal_bulk purge done, removing list `%s'",
+    debug(dbg_general, "removal_bulk purge done, removing list '%s'",
           filename);
     if (unlink(filename) && errno != ENOENT)
       ohshite(_("cannot remove old files list"));
 
     filename = pkgadminfile(pkg, &pkg->installed, POSTRMFILE);
-    debug(dbg_general, "removal_bulk purge done, removing postrm `%s'",
+    debug(dbg_general, "removal_bulk purge done, removing postrm '%s'",
           filename);
     if (unlink(filename) && errno != ENOENT)
       ohshite(_("can't remove old postrm script"));