r1086: * Several man pae typo fixes by Ruben Porras. Closes: #202819

   * Now in a subversion repository, some minor changes for that.
   * dh_link test should expect results in debian/debhelper, not debian/tmp.

diff --git a/debhelper.pod b/debhelper.pod
index 3fa2e2d161ef2cb36ca37a336ff40de2228bdb5b..ad40d71419e0c0a428041d23e53f5e7472de5ca1 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -38,6 +38,10 @@ pages for additional documentation.
 
 =back
 
+If a program's name starts with "dh_", and the program is not on the above
+list, then it is not part of the debhelper package, but it should still
+work like the other programs described on this page.
+
 =head1 DEBHELPER CONFIG FILES
 
 Many debhelper commands make use of files in F<debian/> to control what they

diff --git a/debian/changelog b/debian/changelog
index 4c03e6d84ff499e89a11f30e2c48d1f5fc98d6a6..3d0cec68005e55cc60c6c4ffdd900ad6bdcd89c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (4.1.56) unstable; urgency=low
+
+  * Several man pae typo fixes by Ruben Porras. Closes: #202819
+  * Now in a subversion repository, some minor changes for that.
+  * dh_link test should expect results in debian/debhelper, not debian/tmp.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 28 Jul 2003 15:36:45 -0400
+
 debhelper (4.1.55) unstable; urgency=low
 
   * dh_strip: do not strip files multiple times.

diff --git a/debian/rules b/debian/rules
index ffb2c9ba536dcdc8e3b6f47bf0124ebaf6dfd2fd..0c22f0e476e47fcb1f6299cfda28587019f79e95 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ clean:
 test: test-stamp
 test-stamp:
        ./dh_clean
-       DH_VERSION=10 perl -MTest::Harness -e 'runtests grep { ! /CVS/ } @ARGV' t/*
+       DH_VERSION=10 perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ } @ARGV' t/*
        ./dh_clean
        touch test-stamp
 

diff --git a/dh_installcatalogs b/dh_installcatalogs
index fdaf0fa7609b73d28bd4b020c9ad654dab697d65..eef8cdeb376a971279c1fb20a602cf08f9a980f2 100755 (executable)
--- a/dh_installcatalogs
+++ b/dh_installcatalogs
@@ -17,7 +17,7 @@ B<dh_installcatalogs> [S<I<debhelper options>>] [B<-n>]
 
 =head1 DESCRIPTION
 
-dh_installcatalog is a debhelper program that installs and
+dh_installcatalogs is a debhelper program that installs and
 registers SGML catalogs. (Note: it will be extended for XML catalog
 registration when xml-core is available.)  It complies with the Debian
 XML/SGML policy.

diff --git a/dh_installman b/dh_installman
index 59db6838742178fac5d234f3d3095816cb3741b2..6ee000919ec9509952a51c3082372286a080949c 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -23,8 +23,8 @@ install them based on the section field in their .TH line. If you have a
 properly formatted .TH line, your man page will be installed into the right
 directory, with the right name (this includes proper handling of pages
 with a subsection, like "3perl", which are placed in man3, and given an
-extention of ".3perl"). If your .TH line is incorrect or missing, the program
-may guess wrong based on the file extention.
+extension of ".3perl"). If your .TH line is incorrect or missing, the program
+may guess wrong based on the file extension.
 
 It also supports translated man pages, by looking for extensions
 like .ll.8 and .ll_LL.8

diff --git a/dh_installxfonts b/dh_installxfonts
index 984144b474d6d67e0a7832bccd657e7db9cf093c..c60178db51332b3c0999c68a4e5f76cc9874270d 100755 (executable)
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -25,7 +25,7 @@ directory, and if you have fonts.alias or fonts.scale files, you should
 install them into the correct location under etc/X11/fonts in your package
 build directory.
 
-Your package should should depend on xutils (>= 4.0.3) so that the
+Your package should depend on xutils (>= 4.0.3) so that the
 update-fonts-* commands are available. (This program adds that dependency to
 ${misc:Depends}.)
 

diff --git a/t/dh_link b/t/dh_link
old mode 100644 (file)
new mode 100755 (executable)
index 9f644e7..3ab345e
--- a/t/dh_link
+++ b/t/dh_link
@@ -5,12 +5,12 @@ plan(tests => 3);
 # It used to not make absolute links in this situation, and it should.
 # #37774
 system("./dh_link","etc/foo","usr/lib/bar");
-ok("/etc/foo",readlink("debian/tmp/usr/lib/bar"));
+ok("/etc/foo",readlink("debian/debhelper/usr/lib/bar"));
 
 # let's make sure it makes simple relative links ok.
 system("./dh_link","usr/bin/foo","usr/bin/bar");
-ok("foo",readlink("debian/tmp/usr/bin/bar"));
+ok("foo",readlink("debian/debhelper/usr/bin/bar"));
 
 # ok, more complex relative links.
 system("./dh_link","usr/lib/1","usr/bin/2");
-ok("../lib/1",readlink("debian/tmp/usr/bin/2"));
+ok("../lib/1",readlink("debian/debhelper/usr/bin/2"));