The following commit has been merged in the master branch: commit a27a8e1989b0937e9eee18c2153524c755aba058 Author: Guillem Jover <guil...@debian.org> Date: Sat Aug 20 09:51:13 2011 +0200
Do not use possessive «'s» after ‘s’ or ‘x’ diff --git a/debian/changelog b/debian/changelog index 9aed1a7..9f29809 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1906,7 +1906,7 @@ dpkg (1.15.0) experimental; urgency=low - Cleanup and split of header files. [ Raphaël Hertzog ] - * Enhance dpkg-shlibdeps's error message when a library can't be found to + * Enhance dpkg-shlibdeps' error message when a library can't be found to include the ELF format of the desired library. Closes: #474671 * dpkg-gensymbols now refuses empty values for the the -v -P and -e parameters. @@ -2717,7 +2717,7 @@ dpkg (1.14.16) unstable; urgency=low is used. That way we're consistent with the definition of that variable in deb-substvars(5). Closes: #433477 * Add support of Dm-Upload-Allowed field. Closes: #453400 - * Fix dpkg-shlibdeps's filtering of duplicated dependencies in fields of + * Fix dpkg-shlibdeps' filtering of duplicated dependencies in fields of lesser priority (when -d is used). * Fix behaviour of dpkg-shlibdeps when the same binary was passed multiple times for use in different dependency fields (-d option). diff --git a/man/dpkg-shlibdeps.1 b/man/dpkg-shlibdeps.1 index 96906e6..9bbc8eb 100644 --- a/man/dpkg-shlibdeps.1 +++ b/man/dpkg-shlibdeps.1 @@ -277,8 +277,8 @@ the RPATH of the binary, directories listed in /etc/ld.so.conf, directories listed in the LD_LIBRARY_PATH environment variable, and standard public directories (/lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks those directories in the package's build tree -of the binary being analyzed, in the packages's build trees indicated with -the \-S command-line option, in other packages's build trees that contains +of the binary being analyzed, in the packages' build trees indicated with +the \-S command-line option, in other packages' build trees that contains a DEBIAN/shlibs or DEBIAN/symbols file and finally in the root directory. If the library is not found in any of those directories, then you get this error. diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 46295c0..6503ce5 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -116,7 +116,7 @@ #endif #if defined(OSLinux) -/* This comes from TASK_COMM_LEN defined in Linux's include/linux/sched.h. */ +/* This comes from TASK_COMM_LEN defined in Linux' include/linux/sched.h. */ #define PROCESS_NAME_SIZE 15 #elif defined(OSsunos) #define PROCESS_NAME_SIZE 15 @@ -416,7 +416,7 @@ usage(void) " -a|--startas <pathname> program to start (default is <executable>)\n" " -r|--chroot <directory> chroot to <directory> before starting\n" " -d|--chdir <directory> change to <directory> (default is /)\n" -" -N|--nicelevel <incr> add incr to the process's nice level\n" +" -N|--nicelevel <incr> add incr to the process' nice level\n" " -P|--procsched <policy[:prio]>\n" " use <policy> with <prio> for the kernel\n" " process scheduler (default prio is 0)\n" -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org