diff options
author | joey <joey> | 2005-04-22 15:37:43 +0000 |
---|---|---|
committer | joey <joey> | 2005-04-22 15:37:43 +0000 |
commit | 6a98699c62fde1e1c75b35ecc360dd675e732187 (patch) | |
tree | 7054c331dbb2a6039b19ada50c9f93d8a62c6b90 | |
parent | d721a00f78677b0f8d0c7ece96e5e732115e05ba (diff) | |
download | debhelper-6a98699c62fde1e1c75b35ecc360dd675e732187.tar.gz |
r1754: * Man page typo fixes. Closes: #305809, #305804, #305815, #305810
Closes: #305812, #305814, #305819, #305818, #305817, #305822
-rw-r--r-- | debian/changelog | 7 | ||||
-rwxr-xr-x | dh_installcatalogs | 4 | ||||
-rwxr-xr-x | dh_installdocs | 2 | ||||
-rwxr-xr-x | dh_installman | 2 | ||||
-rwxr-xr-x | dh_makeshlibs | 16 | ||||
-rwxr-xr-x | dh_scrollkeeper | 2 | ||||
-rwxr-xr-x | dh_shlibdeps | 4 | ||||
-rwxr-xr-x | dh_strip | 4 | ||||
-rwxr-xr-x | dh_usrlocal | 4 |
9 files changed, 26 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog index 6d504a0a..050e71fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (4.2.35) UNRELEASED; urgency=low + + * Man page typo fixes. Closes: #305809, #305804, #305815, #305810 + Closes: #305812, #305814, #305819, #305818, #305817, #305822 + + -- Joey Hess <joeyh@debian.org> Fri, 22 Apr 2005 11:27:55 -0400 + debhelper (4.2.34) unstable; urgency=low * The infinite number of monkeys release. diff --git a/dh_installcatalogs b/dh_installcatalogs index c020820c..6bd42273 100755 --- a/dh_installcatalogs +++ b/dh_installcatalogs @@ -34,9 +34,9 @@ F</etc/sgml/I<package>.cat>. This command automatically adds maintainer script snippets for registering and unregistering the catalogs and "supercatalogs" (unless -B<-n> is used). A dependancy on B<sgml-base> will be added to +B<-n> is used). A dependency on B<sgml-base> will be added to C<${misc:Depends}>, so be sure your package uses that variable in -F<debian/control>. See L<dh_installdeb(1)> for an explantion of +F<debian/control>. See L<dh_installdeb(1)> for an explanation of Debhelper maintainer script snippets. =head1 OPTIONS diff --git a/dh_installdocs b/dh_installdocs index b694d7c0..f1c66197 100755 --- a/dh_installdocs +++ b/dh_installdocs @@ -20,7 +20,7 @@ documentation into usr/share/doc/package in package build directories. dh_installdocs automatically installs debian/copyright if it exists. If dh_installdocs is acting on multiple packages, debian/copyright files will be -installed into all packages. However, if you need to have seperate copyright +installed into all packages. However, if you need to have separate copyright files for different binary packages, you can use files named debian/package.copyright. diff --git a/dh_installman b/dh_installman index b626e33d..1d03898e 100755 --- a/dh_installman +++ b/dh_installman @@ -37,7 +37,7 @@ section. If dh_installman seems to install a man page into a directory like /usr/share/man/pl/man1/, that is because your program has a name like "foo.pl", and dh_installman assumes that means it is translated into Polish. There is currently no support for resolving this ambiguity; -programs in debian should proably not have extensions like that anyway. +programs in debian should probably not have extensions like that anyway. Any man page filenames specified as parameters will be installed into the first package dh_installman is told to act on. By default, this is the diff --git a/dh_makeshlibs b/dh_makeshlibs index 5a032790..c530b4ce 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -11,7 +11,7 @@ use Debian::Debhelper::Dh_Lib; =head1 SYNOPSIS -B<dh_makeshlibs> [S<I<debhelper options>>] [B<-m>I<major>] [B<-V>I<[dependancies]>] [B<-n>] [B<-X>I<item>] +B<dh_makeshlibs> [S<I<debhelper options>>] [B<-m>I<major>] [B<-V>I<[dependencies]>] [B<-n>] [B<-X>I<item>] =head1 DESCRIPTION @@ -32,19 +32,19 @@ use the major number specified after the -m parameter. This is much less useful than it used to be, back in the bad old days when this program looked at library filenames rather than using objdump. -=item B<-V>, B<-V>I<dependancies> +=item B<-V>, B<-V>I<dependencies> -=item B<--version-info>, B<--version-info=>I<dependancies> +=item B<--version-info>, B<--version-info=>I<dependencies> By default, the shlibs file generated by this program does not make packages depend on any particular version of the package containing the shared library. It may be necessary for you to add some version dependancy -information to the shlibs file. If -V is specified with no dependancy +information to the shlibs file. If -V is specified with no dependency information, the current upstream version of the package is plugged into a -dependancy that looks like "packagename (>= packageversion)". Note that in -debhelper compatability levels before v4, the debian part of the package +dependency that looks like "packagename (>= packageversion)". Note that in +debhelper compatibility levels before v4, the debian part of the package version number is also included. If -V is specified with parameters, the -parameters can be used to specify the exact dependancy information needed +parameters can be used to specify the exact dependency information needed (be sure to include the package name). Beware of using -V without any parameters; this is a conservative setting @@ -146,7 +146,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # as a side effect. isnative($package); my $version = $dh{VERSION}; - # Old compatability levels include the + # Old compatibility levels include the # debian revision, while new do not. if (! compat(3)) { # Remove debian version, if any. diff --git a/dh_scrollkeeper b/dh_scrollkeeper index 7e19ec7f..3cfd414f 100755 --- a/dh_scrollkeeper +++ b/dh_scrollkeeper @@ -21,7 +21,7 @@ ScrollKeeper. This command automatically adds maintainer script snippets for registering and unregistering files with ScrollKeeper (unless B<-n> is used). See -L<dh_installdeb(1)> for an explantion of Debhelper maintainer script +L<dh_installdeb(1)> for an explanation of Debhelper maintainer script snippets. It will also change any DTD declarations in the OMF and DocBook files diff --git a/dh_shlibdeps b/dh_shlibdeps index a7806388..c36abb46 100755 --- a/dh_shlibdeps +++ b/dh_shlibdeps @@ -17,7 +17,7 @@ B<dh_shlibdeps> [S<I<debhelper options>>] [B<-L>I<package>] [B<-l>I<directory>] =head1 DESCRIPTION dh_shlibdeps is a debhelper program that is responsible for calculating -shared library dependancies for packages. +shared library dependencies for packages. This program is merely a wrapper around L<dpkg-shlibdeps(1)> that calls it once for each package listed in the control file, passing it @@ -36,7 +36,7 @@ Pass "params" to L<dpkg-shlibdeps(1)>. =item B<-X>I<item>, B<--exclude=>I<item> Exclude files that contain "item" anywhere in their filename from being -passed to dpkg-shlibdeps. This will make their dependancies be ignored. +passed to dpkg-shlibdeps. This will make their dependencies be ignored. This may be useful in some situations, but use it with caution. This option may be used more than once to exclude more than one thing. @@ -21,7 +21,7 @@ executables, shared libraries, and static libraries that are not used for debugging. This program examines your package build directories and works out what -to strip on its own. It uses L<file(1)> and file permisions and filenames +to strip on its own. It uses L<file(1)> and file permissions and filenames to figure out what files are shared libraries (*.so), executable binaries, and static (lib*.a) and debugging libraries (lib*_g.a, debug/*.so), and strips each as much as is possible. (Which is not at all for debugging @@ -63,7 +63,7 @@ binutils (>= 2.14.90.0.7). =item B<-k>, B<--keep-debug> -Debug symbols will be retained, but split into an independant +Debug symbols will be retained, but split into an independent file in usr/lib/debug/ in the package build directory. --dbg-package is easier to use than this option, but this option is more flexible. diff --git a/dh_usrlocal b/dh_usrlocal index 603c37ca..da709491 100755 --- a/dh_usrlocal +++ b/dh_usrlocal @@ -25,11 +25,11 @@ It finds subdirectories of usr/local in the package build directory, and removes them, replacing them with maintainer script snippets (unless B<-n> is used) to create the directories at install time, and remove them when the package is removed, in a manner compliant with Debian policy. See -L<dh_installdeb(1)> for an explantion of Debhelper maintainer script +L<dh_installdeb(1)> for an explanation of Debhelper maintainer script snippets. If the directories found in the build tree have unusual owners, groups, or -permisions, then those values will be preserved in the directories made by +permissions, then those values will be preserved in the directories made by the postinst script. However, as a special exception, if a directory is owned by root.root, it will be treated as if it is owned by root.staff and is mode 2775. This is useful, since that is the group and mode policy recommends for |