diff options
45 files changed, 54 insertions, 47 deletions
diff --git a/Debian/Debhelper/Dh_Getopt.pm b/Debian/Debhelper/Dh_Getopt.pm index 1e90e08a..53db13ae 100644 --- a/Debian/Debhelper/Dh_Getopt.pm +++ b/Debian/Debhelper/Dh_Getopt.pm @@ -19,7 +19,7 @@ my (%options, %exclude_package); sub showhelp { my $prog=basename($0); print "Usage: $prog [options]\n\n"; - print " $prog is a part of debhelper. See debhelper(1)\n"; + print " $prog is a part of debhelper. See debhelper(7)\n"; print " and $prog(1) for complete usage instructions.\n"; exit(1); } diff --git a/debian/changelog b/debian/changelog index 3b633d6f..79ddc799 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (4.1.35) unstable; urgency=low + + * Rename debhelper.1 to debhelper.7. + * Typo, Closes: #183267 + + -- Joey Hess <joeyh@debian.org> Mon, 3 Mar 2003 16:23:32 -0500 + debhelper (4.1.34) unstable; urgency=low * Removed vegistal substvars stuff from dh_inistallinit. diff --git a/debian/rules b/debian/rules index ab30a3e5..e53eea42 100755 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ build: test build-stamp build-stamp: # Generate the main man page. All the perl cruft is to get a list # of debhelper commands with short descriptions into the man page. - pod2man -c Debhelper -r "$(VERSION)" debhelper.pod | \ + pod2man --section=7 -c Debhelper -r "$(VERSION)" debhelper.pod | \ perl -e ' \ undef $$/; \ foreach (@ARGV) { \ @@ -39,7 +39,7 @@ build-stamp: s/#LIST#/$$collect/; \ print; \ }; \ - }' `find . -type f -perm +1 -maxdepth 1 -name "dh_*" | sort` > debhelper.1 + }' `find . -type f -perm +1 -maxdepth 1 -name "dh_*" | sort` > debhelper.7 # Turn all executables into man pages. find . -type f -perm +1 -maxdepth 1 -name "dh_*" \ -exec pod2man -c Debhelper -r "$(VERSION)" {} {}.1 \; @@ -74,7 +74,7 @@ binary-indep: build ./dh_install autoscripts usr/share/debhelper ./dh_installdocs doc/* ./dh_installexamples examples/* - ./dh_installman *.1 + ./dh_installman *.1 *.7 ./dh_installchangelogs ./dh_shlibdeps ./dh_link diff --git a/dh_builddeb b/dh_builddeb index 54c4362f..a634be2e 100755 --- a/dh_builddeb +++ b/dh_builddeb @@ -67,7 +67,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. @@ -114,7 +114,7 @@ doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1); =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_compress b/dh_compress index de6a97b9..9d287af4 100755 --- a/dh_compress +++ b/dh_compress @@ -180,7 +180,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_fixperms b/dh_fixperms index d6b0f721..1a35c78d 100755 --- a/dh_fixperms +++ b/dh_fixperms @@ -94,7 +94,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_gencontrol b/dh_gencontrol index 941c9a8c..4e9ff3e8 100755 --- a/dh_gencontrol +++ b/dh_gencontrol @@ -69,7 +69,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. @@ -221,7 +221,7 @@ If you want a libfoo-dev package too, debian/libfoo-dev.install might contain: =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installcatalogs b/dh_installcatalogs index 16bab813..6bdc977d 100755 --- a/dh_installcatalogs +++ b/dh_installcatalogs @@ -104,7 +104,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> F</usr/share/doc/sgml-base-doc/> diff --git a/dh_installchangelogs b/dh_installchangelogs index 2588d57f..4c211e55 100755 --- a/dh_installchangelogs +++ b/dh_installchangelogs @@ -134,7 +134,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installcron b/dh_installcron index 5b3ac84e..d28277c5 100755 --- a/dh_installcron +++ b/dh_installcron @@ -47,7 +47,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installdeb b/dh_installdeb index 2cbdce30..7c7f8d18 100755 --- a/dh_installdeb +++ b/dh_installdeb @@ -36,7 +36,7 @@ inserted. If the script does not exist, then a script is generated from the .debhelper file. The .debhelper files are created by other debhelper programs, such as L<dh_installmenu(1)>, and are shell script fragments. -In V3 compatability mode and higher, all files in the etc/ directory in a +In V3 compatibility mode and higher, all files in the etc/ directory in a package will automatically be flagged as conffiles by this program, so there is no need to list them manually in package.conffiles. @@ -106,7 +106,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installdebconf b/dh_installdebconf index 2e22474d..fc81d1fe 100755 --- a/dh_installdebconf +++ b/dh_installdebconf @@ -126,7 +126,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installdirs b/dh_installdirs index 9d27b1b2..3bd4ea80 100755 --- a/dh_installdirs +++ b/dh_installdirs @@ -86,7 +86,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installdocs b/dh_installdocs index 7f8e8bf4..b991162f 100755 --- a/dh_installdocs +++ b/dh_installdocs @@ -215,7 +215,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installemacsen b/dh_installemacsen index 3f8a9f79..80b83e69 100755 --- a/dh_installemacsen +++ b/dh_installemacsen @@ -107,7 +107,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installexamples b/dh_installexamples index 26517e71..8934e2fb 100755 --- a/dh_installexamples +++ b/dh_installexamples @@ -99,7 +99,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installinfo b/dh_installinfo index 4232229a..814c831b 100755 --- a/dh_installinfo +++ b/dh_installinfo @@ -119,7 +119,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installinit b/dh_installinit index d8b94d53..5e4e1f35 100755 --- a/dh_installinit +++ b/dh_installinit @@ -170,7 +170,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installlogrotate b/dh_installlogrotate index 6aec670f..e028bf78 100755 --- a/dh_installlogrotate +++ b/dh_installlogrotate @@ -37,7 +37,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installman b/dh_installman index 3da08ccb..41fa6408 100755 --- a/dh_installman +++ b/dh_installman @@ -202,7 +202,7 @@ sub find_so_man { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installmanpages b/dh_installmanpages index 9002094c..39946f6a 100755 --- a/dh_installmanpages +++ b/dh_installmanpages @@ -195,7 +195,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installmenu b/dh_installmenu index 212423c4..b6f79663 100755 --- a/dh_installmenu +++ b/dh_installmenu @@ -78,7 +78,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> L<update-menus(1)> L<menufile(5L)> diff --git a/dh_installmime b/dh_installmime index c8a7e804..8ffd5236 100755 --- a/dh_installmime +++ b/dh_installmime @@ -64,7 +64,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installmodules b/dh_installmodules index a67b80a8..13fd8f5c 100755 --- a/dh_installmodules +++ b/dh_installmodules @@ -83,7 +83,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installpam b/dh_installpam index 065263d5..0f251798 100755 --- a/dh_installpam +++ b/dh_installpam @@ -39,7 +39,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installwm b/dh_installwm index fdcb150f..31ce63c6 100755 --- a/dh_installwm +++ b/dh_installwm @@ -93,7 +93,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_installxfonts b/dh_installxfonts index 0ee9cb3a..407763aa 100755 --- a/dh_installxfonts +++ b/dh_installxfonts @@ -82,7 +82,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. @@ -170,7 +170,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_listpackages b/dh_listpackages index 804461c5..f919ef62 100755 --- a/dh_listpackages +++ b/dh_listpackages @@ -27,7 +27,7 @@ print join("\n",@{$dh{DOPACKAGES}})."\n"; =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_makeshlibs b/dh_makeshlibs index 3d63991c..7a4e7b1d 100755 --- a/dh_makeshlibs +++ b/dh_makeshlibs @@ -172,7 +172,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. @@ -84,7 +84,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_movefiles b/dh_movefiles index ec13a01a..cc1af45e 100755 --- a/dh_movefiles +++ b/dh_movefiles @@ -156,7 +156,7 @@ exit $ret; =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. @@ -136,7 +136,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. @@ -199,7 +199,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_shlibdeps b/dh_shlibdeps index f4930054..3fae6a66 100755 --- a/dh_shlibdeps +++ b/dh_shlibdeps @@ -134,7 +134,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. @@ -142,7 +142,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_suidregister b/dh_suidregister index 263e7278..3bc9bd98 100755 --- a/dh_suidregister +++ b/dh_suidregister @@ -116,7 +116,7 @@ if ($notused) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. @@ -42,7 +42,7 @@ foreach my $file ('debian/control', @ARGV) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_testroot b/dh_testroot index b97b13bb..34684768 100755 --- a/dh_testroot +++ b/dh_testroot @@ -25,7 +25,7 @@ if ($< != 0) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_testversion b/dh_testversion index e7fbfec9..a17f22e9 100755 --- a/dh_testversion +++ b/dh_testversion @@ -73,7 +73,7 @@ if (defined $compare and defined $ver) { =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/dh_undocumented b/dh_undocumented index 5bce840f..5596485c 100755 --- a/dh_undocumented +++ b/dh_undocumented @@ -27,7 +27,7 @@ warning("This program does nothing and should no longer be used."); =head1 SEE ALSO -L<debhelper(1)> +L<debhelper(7)> This program is a part of debhelper. diff --git a/doc/PROGRAMMING b/doc/PROGRAMMING index d90d50ca..2fbf7378 100644 --- a/doc/PROGRAMMING +++ b/doc/PROGRAMMING @@ -19,7 +19,7 @@ have a lot of noise output when all the debhelper commands in a debian/rules are run, so the important stuff is clearly visible. Debhelper programs should accept all options listed in the "SHARED -DEBHELPER OPTIONS" section of debhelper(1), including and any long forms of +DEBHELPER OPTIONS" section of debhelper(7), including and any long forms of these options, like --verbose . If necessary, the options may be ignored. If debhelper commands need config files, they should use @@ -1 +1 @@ -Please see the debhelper(1) man page for documentation. +Please see the debhelper(7) man page for documentation. |