r1825: releasing version 5.0.8

diff --git a/debian/changelog b/debian/changelog
index 0d5e1af611ff3eaefe959df609aa30c83e826835..952ee01d57ef110373fc81aca4250f2f8c6e95cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-debhelper (5.0.8) UNRELEASED; urgency=low
+debhelper (5.0.8) unstable; urgency=low
 
   * Man page type fixes (yes, more, nice to know people read the man pages).
     Closes: #341289
+  * dh_installdocs: Make -X also exclude matching doc-base files from being
+    installed. Closes: #342033
 
- -- Joey Hess <joeyh@debian.org>  Tue, 29 Nov 2005 17:25:45 -0500
+ -- Joey Hess <joeyh@debian.org>  Mon,  5 Dec 2005 14:31:23 -0500
 
 debhelper (5.0.7) unstable; urgency=low
 

diff --git a/dh_installdocs b/dh_installdocs
index 2ec9bda95b23525844ff1732f06e9fdc42cd5070..eb7d126c6121861a21bf8ac1d15095041f244005 100755 (executable)
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -198,6 +198,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        foreach my $fn (grep {/^${regexp}doc-base(\..*)?$/} readdir(DEB)) {
                # .EX are example files, generated by eg, dh-make
                next if $fn=~/\.EX$/;
+               next if excludefile($fn);
                # Parse the file to get the doc id.
                open (IN, "debian/$fn") || die "Cannot read debian/$fn.";
                while (<IN>) {

diff --git a/man/po4a/po/debhelper.pot b/man/po4a/po/debhelper.pot
index a2bdd9f919c5f8c2d4e3e555655b5bd6a1a4ac10..e7e40809151468847c450b03a47b6db7b0da1330 100644 (file)
--- a/man/po4a/po/debhelper.pot
+++ b/man/po4a/po/debhelper.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-11-13 13:41-0500\n"
+"POT-Creation-Date: 2005-12-05 14:32-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -72,27 +72,27 @@ msgid ""
 msgstr ""
 
 # type: =head1
-#: dh_installpam:52 dh_installemacsen:108 dh_installinfo:122 dh_strip:221 dh_installppp:56 dh_compress:189 dh_md5sums:86 dh_installexamples:102 dh_installcron:61 dh_installinit:188 dh_usrlocal:113 dh_gconf:58 dh_installmodules:102 dh_installmenu:79 dh_installlogrotate:50 debhelper.pod:433 dh_clean:106 dh_undocumented:28 dh_testversion:74 dh_testdir:43 dh_shlibdeps:148 dh_scrollkeeper:75 dh_installdirs:87 dh_link:206 dh_installdebconf:135 dh_installmime:84 dh_installwm:94 dh_installdeb:93 dh_builddeb:78 dh_gencontrol:73 dh_install:251 dh_makeshlibs:183 dh_perl:140 dh_fixperms:107 dh_listpackages:28 dh_installman:210 dh_testroot:26 dh_movefiles:162 dh_desktop:43 dh_suidregister:117 dh_installchangelogs:125 dh_python:266 dh_installdocs:232 dh_installcatalogs:105 dh_installmanpages:197 dh_installxfonts:83 dh_installlogcheck:51
+#: dh_installpam:52 dh_installemacsen:108 dh_installinfo:122 dh_strip:221 dh_installppp:56 dh_compress:189 dh_md5sums:86 dh_installexamples:102 dh_installcron:61 dh_installinit:188 dh_usrlocal:113 dh_gconf:58 dh_installmodules:102 dh_installmenu:79 dh_installlogrotate:50 debhelper.pod:433 dh_clean:106 dh_undocumented:28 dh_testversion:74 dh_testdir:43 dh_shlibdeps:148 dh_scrollkeeper:75 dh_installdirs:87 dh_link:206 dh_installdebconf:135 dh_installmime:84 dh_installwm:94 dh_installdeb:93 dh_builddeb:78 dh_gencontrol:73 dh_install:251 dh_makeshlibs:183 dh_perl:140 dh_fixperms:107 dh_listpackages:28 dh_installman:210 dh_testroot:26 dh_movefiles:162 dh_desktop:43 dh_suidregister:117 dh_installchangelogs:125 dh_python:266 dh_installdocs:233 dh_installcatalogs:105 dh_installmanpages:197 dh_installxfonts:83 dh_installlogcheck:51
 msgid "SEE ALSO"
 msgstr ""
 
 # type: textblock
-#: dh_installpam:54 dh_installemacsen:110 dh_installinfo:124 dh_strip:223 dh_installppp:58 dh_compress:191 dh_md5sums:88 dh_installexamples:104 dh_installcron:63 dh_installinit:190 dh_usrlocal:115 dh_gconf:60 dh_installmodules:104 dh_installlogrotate:52 dh_clean:108 dh_undocumented:30 dh_testversion:76 dh_testdir:45 dh_installdirs:89 dh_link:208 dh_installdebconf:137 dh_installmime:86 dh_installwm:96 dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253 dh_makeshlibs:185 dh_perl:142 dh_fixperms:109 dh_listpackages:30 dh_installman:212 dh_testroot:28 dh_movefiles:164 dh_suidregister:119 dh_installchangelogs:127 dh_python:268 dh_installdocs:234 dh_installcatalogs:107 dh_installmanpages:199 dh_installxfonts:85 dh_installlogcheck:53
+#: dh_installpam:54 dh_installemacsen:110 dh_installinfo:124 dh_strip:223 dh_installppp:58 dh_compress:191 dh_md5sums:88 dh_installexamples:104 dh_installcron:63 dh_installinit:190 dh_usrlocal:115 dh_gconf:60 dh_installmodules:104 dh_installlogrotate:52 dh_clean:108 dh_undocumented:30 dh_testversion:76 dh_testdir:45 dh_installdirs:89 dh_link:208 dh_installdebconf:137 dh_installmime:86 dh_installwm:96 dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253 dh_makeshlibs:185 dh_perl:142 dh_fixperms:109 dh_listpackages:30 dh_installman:212 dh_testroot:28 dh_movefiles:164 dh_suidregister:119 dh_installchangelogs:127 dh_python:268 dh_installdocs:235 dh_installcatalogs:107 dh_installmanpages:199 dh_installxfonts:85 dh_installlogcheck:53
 msgid "L<debhelper(7)>"
 msgstr ""
 
 # type: textblock
-#: dh_installpam:56 dh_installemacsen:112 dh_installinfo:126 dh_strip:225 dh_installppp:60 dh_compress:193 dh_md5sums:90 dh_installexamples:106 dh_installcron:65 dh_installinit:192 dh_usrlocal:117 dh_gconf:62 dh_installmodules:106 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110 dh_undocumented:32 dh_testversion:78 dh_testdir:47 dh_shlibdeps:152 dh_scrollkeeper:79 dh_installdirs:91 dh_link:210 dh_installdebconf:139 dh_installmime:88 dh_installwm:98 dh_installdeb:97 dh_builddeb:82 dh_gencontrol:77 dh_install:255 dh_makeshlibs:187 dh_perl:144 dh_fixperms:111 dh_listpackages:32 dh_installman:214 dh_testroot:30 dh_movefiles:166 dh_desktop:47 dh_suidregister:121 dh_installchangelogs:129 dh_python:270 dh_installdocs:236 dh_installmanpages:201 dh_installxfonts:87
+#: dh_installpam:56 dh_installemacsen:112 dh_installinfo:126 dh_strip:225 dh_installppp:60 dh_compress:193 dh_md5sums:90 dh_installexamples:106 dh_installcron:65 dh_installinit:192 dh_usrlocal:117 dh_gconf:62 dh_installmodules:106 dh_installmenu:85 dh_installlogrotate:54 dh_clean:110 dh_undocumented:32 dh_testversion:78 dh_testdir:47 dh_shlibdeps:152 dh_scrollkeeper:79 dh_installdirs:91 dh_link:210 dh_installdebconf:139 dh_installmime:88 dh_installwm:98 dh_installdeb:97 dh_builddeb:82 dh_gencontrol:77 dh_install:255 dh_makeshlibs:187 dh_perl:144 dh_fixperms:111 dh_listpackages:32 dh_installman:214 dh_testroot:30 dh_movefiles:166 dh_desktop:47 dh_suidregister:121 dh_installchangelogs:129 dh_python:270 dh_installdocs:237 dh_installmanpages:201 dh_installxfonts:87
 msgid "This program is a part of debhelper."
 msgstr ""
 
 # type: =head1
-#: dh_installpam:58 dh_installemacsen:114 dh_installinfo:128 dh_strip:227 dh_installppp:62 dh_compress:195 dh_md5sums:92 dh_installexamples:108 dh_installcron:67 dh_installinit:194 dh_usrlocal:119 dh_gconf:64 dh_installmodules:108 dh_installmenu:87 dh_installlogrotate:56 debhelper.pod:447 dh_clean:112 dh_undocumented:34 dh_testversion:80 dh_testdir:49 dh_shlibdeps:154 dh_scrollkeeper:81 dh_installdirs:93 dh_link:212 dh_installdebconf:141 dh_installmime:90 dh_installwm:100 dh_installdeb:99 dh_builddeb:84 dh_gencontrol:79 dh_install:257 dh_makeshlibs:189 dh_perl:146 dh_fixperms:113 dh_listpackages:34 dh_installman:216 dh_testroot:32 dh_movefiles:168 dh_desktop:49 dh_suidregister:123 dh_installchangelogs:131 dh_python:272 dh_installdocs:238 dh_installcatalogs:111 dh_installmanpages:203 dh_installxfonts:89 dh_installlogcheck:57
+#: dh_installpam:58 dh_installemacsen:114 dh_installinfo:128 dh_strip:227 dh_installppp:62 dh_compress:195 dh_md5sums:92 dh_installexamples:108 dh_installcron:67 dh_installinit:194 dh_usrlocal:119 dh_gconf:64 dh_installmodules:108 dh_installmenu:87 dh_installlogrotate:56 debhelper.pod:447 dh_clean:112 dh_undocumented:34 dh_testversion:80 dh_testdir:49 dh_shlibdeps:154 dh_scrollkeeper:81 dh_installdirs:93 dh_link:212 dh_installdebconf:141 dh_installmime:90 dh_installwm:100 dh_installdeb:99 dh_builddeb:84 dh_gencontrol:79 dh_install:257 dh_makeshlibs:189 dh_perl:146 dh_fixperms:113 dh_listpackages:34 dh_installman:216 dh_testroot:32 dh_movefiles:168 dh_desktop:49 dh_suidregister:123 dh_installchangelogs:131 dh_python:272 dh_installdocs:239 dh_installcatalogs:111 dh_installmanpages:203 dh_installxfonts:89 dh_installlogcheck:57
 msgid "AUTHOR"
 msgstr ""
 
 # type: textblock
-#: dh_installpam:60 dh_installemacsen:116 dh_installinfo:130 dh_strip:229 dh_installppp:64 dh_compress:197 dh_md5sums:94 dh_installexamples:110 dh_installcron:69 dh_installinit:196 dh_installmodules:110 dh_installmenu:89 dh_installlogrotate:58 debhelper.pod:449 dh_clean:114 dh_undocumented:36 dh_testversion:82 dh_testdir:51 dh_shlibdeps:156 dh_installdirs:95 dh_link:214 dh_installdebconf:143 dh_installmime:92 dh_installwm:102 dh_installdeb:101 dh_builddeb:86 dh_gencontrol:81 dh_install:259 dh_makeshlibs:191 dh_fixperms:115 dh_listpackages:36 dh_installman:218 dh_testroot:34 dh_movefiles:170 dh_suidregister:125 dh_installchangelogs:133 dh_installdocs:240 dh_installmanpages:205 dh_installxfonts:91
+#: dh_installpam:60 dh_installemacsen:116 dh_installinfo:130 dh_strip:229 dh_installppp:64 dh_compress:197 dh_md5sums:94 dh_installexamples:110 dh_installcron:69 dh_installinit:196 dh_installmodules:110 dh_installmenu:89 dh_installlogrotate:58 debhelper.pod:449 dh_clean:114 dh_undocumented:36 dh_testversion:82 dh_testdir:51 dh_shlibdeps:156 dh_installdirs:95 dh_link:214 dh_installdebconf:143 dh_installmime:92 dh_installwm:102 dh_installdeb:101 dh_builddeb:86 dh_gencontrol:81 dh_install:259 dh_makeshlibs:191 dh_fixperms:115 dh_listpackages:36 dh_installman:218 dh_testroot:34 dh_movefiles:170 dh_suidregister:125 dh_installchangelogs:133 dh_installdocs:241 dh_installmanpages:205 dh_installxfonts:91
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr ""
 
@@ -1449,10 +1449,10 @@ msgstr ""
 #: debhelper.pod:252
 msgid ""
 "Unless otherwise indicated, all debhelper documentation assumes that you are "
-"using the most recent compatability level, and in most cases does not "
-"indicate if the behavior is different in an earlier compatability level, so "
-"if you are not using the most recent compatability level, you're advised to "
-"read below for notes about what is different in earlier compatability "
+"using the most recent compatibility level, and in most cases does not "
+"indicate if the behavior is different in an earlier compatibility level, so "
+"if you are not using the most recent compatibility level, you're advised to "
+"read below for notes about what is different in earlier compatibility "
 "levels."
 msgstr ""
 

diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po
index 3840f55a6cf2f9721728fccd940ac7d6be059bb4..32ed7bbaba5cf51d444b5c00e61c448494312ce1 100644 (file)
--- a/man/po4a/po/es.po
+++ b/man/po4a/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-11-08 16:41-0500\n"
+"POT-Creation-Date: 2005-12-05 14:32-0500\n"
 "PO-Revision-Date: 2005-09-18 00:11+0200\n"
 "Last-Translator: Rubén Porras Campo <debian-l10n-spanish@lists.debian.org>\n"
 "Language-Team: SPANISH <debian-l10n-spanish@lists.debian.org>\n"
@@ -134,7 +134,7 @@ msgstr ""
 #: dh_makeshlibs:183 dh_perl:140 dh_fixperms:107 dh_listpackages:28
 #: dh_installman:210 dh_testroot:26 dh_movefiles:162 dh_desktop:43
 #: dh_suidregister:117 dh_installchangelogs:125 dh_python:266
-#: dh_installdocs:232 dh_installcatalogs:105 dh_installmanpages:197
+#: dh_installdocs:233 dh_installcatalogs:105 dh_installmanpages:197
 #: dh_installxfonts:83 dh_installlogcheck:51
 msgid "SEE ALSO"
 msgstr "VÉASE ADEMÁS"
@@ -149,7 +149,7 @@ msgstr "V
 #: dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253
 #: dh_makeshlibs:185 dh_perl:142 dh_fixperms:109 dh_listpackages:30
 #: dh_installman:212 dh_testroot:28 dh_movefiles:164 dh_suidregister:119
-#: dh_installchangelogs:127 dh_python:268 dh_installdocs:234
+#: dh_installchangelogs:127 dh_python:268 dh_installdocs:235
 #: dh_installcatalogs:107 dh_installmanpages:199 dh_installxfonts:85
 #: dh_installlogcheck:53
 msgid "L<debhelper(7)>"
@@ -166,7 +166,7 @@ msgstr "L<debhelper(7)>"
 #: dh_gencontrol:77 dh_install:255 dh_makeshlibs:187 dh_perl:144
 #: dh_fixperms:111 dh_listpackages:32 dh_installman:214 dh_testroot:30
 #: dh_movefiles:166 dh_desktop:47 dh_suidregister:121 dh_installchangelogs:129
-#: dh_python:270 dh_installdocs:236 dh_installmanpages:201 dh_installxfonts:87
+#: dh_python:270 dh_installdocs:237 dh_installmanpages:201 dh_installxfonts:87
 msgid "This program is a part of debhelper."
 msgstr "Este programa es parte de debhelper."
 
@@ -182,7 +182,7 @@ msgstr "Este programa es parte de debhelper."
 #: dh_makeshlibs:189 dh_perl:146 dh_fixperms:113 dh_listpackages:34
 #: dh_installman:216 dh_testroot:32 dh_movefiles:168 dh_desktop:49
 #: dh_suidregister:123 dh_installchangelogs:131 dh_python:272
-#: dh_installdocs:238 dh_installcatalogs:111 dh_installmanpages:203
+#: dh_installdocs:239 dh_installcatalogs:111 dh_installmanpages:203
 #: dh_installxfonts:89 dh_installlogcheck:57
 msgid "AUTHOR"
 msgstr "AUTOR"
@@ -197,7 +197,7 @@ msgstr "AUTOR"
 #: dh_installwm:102 dh_installdeb:101 dh_builddeb:86 dh_gencontrol:81
 #: dh_install:259 dh_makeshlibs:191 dh_fixperms:115 dh_listpackages:36
 #: dh_installman:218 dh_testroot:34 dh_movefiles:170 dh_suidregister:125
-#: dh_installchangelogs:133 dh_installdocs:240 dh_installmanpages:205
+#: dh_installchangelogs:133 dh_installdocs:241 dh_installmanpages:205
 #: dh_installxfonts:91
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -1995,10 +1995,10 @@ msgstr ""
 #: debhelper.pod:252
 msgid ""
 "Unless otherwise indicated, all debhelper documentation assumes that you are "
-"using the most recent compatability level, and in most cases does not "
-"indicate if the behavior is different in an earlier compatability level, so "
-"if you are not using the most recent compatability level, you're advised to "
-"read below for notes about what is different in earlier compatability levels."
+"using the most recent compatibility level, and in most cases does not "
+"indicate if the behavior is different in an earlier compatibility level, so "
+"if you are not using the most recent compatibility level, you're advised to "
+"read below for notes about what is different in earlier compatibility levels."
 msgstr ""
 
 # type: textblock

diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po
index 24fe85e2a22427aa5e7ad3b2d7e035f797ec9ed7..e66a59c768be1cd3139ae579d7f9152802c8ffcf 100644 (file)
--- a/man/po4a/po/fr.po
+++ b/man/po4a/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
-"POT-Creation-Date: 2005-11-13 13:32-0500\n"
+"POT-Creation-Date: 2005-12-05 14:32-0500\n"
 "PO-Revision-Date: 2005-11-10 17:21+0100\n"
 "Last-Translator: Valery Perrin\n"
 "Language-Team:  <debian-l10n-french@lists.debian.org>\n"
@@ -140,7 +140,7 @@ msgstr ""
 #: dh_makeshlibs:183 dh_perl:140 dh_fixperms:107 dh_listpackages:28
 #: dh_installman:210 dh_testroot:26 dh_movefiles:162 dh_desktop:43
 #: dh_suidregister:117 dh_installchangelogs:125 dh_python:266
-#: dh_installdocs:232 dh_installcatalogs:105 dh_installmanpages:197
+#: dh_installdocs:233 dh_installcatalogs:105 dh_installmanpages:197
 #: dh_installxfonts:83 dh_installlogcheck:51
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
@@ -155,7 +155,7 @@ msgstr "VOIR AUSSI"
 #: dh_installdeb:95 dh_builddeb:80 dh_gencontrol:75 dh_install:253
 #: dh_makeshlibs:185 dh_perl:142 dh_fixperms:109 dh_listpackages:30
 #: dh_installman:212 dh_testroot:28 dh_movefiles:164 dh_suidregister:119
-#: dh_installchangelogs:127 dh_python:268 dh_installdocs:234
+#: dh_installchangelogs:127 dh_python:268 dh_installdocs:235
 #: dh_installcatalogs:107 dh_installmanpages:199 dh_installxfonts:85
 #: dh_installlogcheck:53
 msgid "L<debhelper(7)>"
@@ -172,7 +172,7 @@ msgstr "L<debhelper(7)>"
 #: dh_gencontrol:77 dh_install:255 dh_makeshlibs:187 dh_perl:144
 #: dh_fixperms:111 dh_listpackages:32 dh_installman:214 dh_testroot:30
 #: dh_movefiles:166 dh_desktop:47 dh_suidregister:121 dh_installchangelogs:129
-#: dh_python:270 dh_installdocs:236 dh_installmanpages:201 dh_installxfonts:87
+#: dh_python:270 dh_installdocs:237 dh_installmanpages:201 dh_installxfonts:87
 msgid "This program is a part of debhelper."
 msgstr "Ce programme fait partie de debhelper."
 
@@ -188,7 +188,7 @@ msgstr "Ce programme fait partie de debhelper."
 #: dh_makeshlibs:189 dh_perl:146 dh_fixperms:113 dh_listpackages:34
 #: dh_installman:216 dh_testroot:32 dh_movefiles:168 dh_desktop:49
 #: dh_suidregister:123 dh_installchangelogs:131 dh_python:272
-#: dh_installdocs:238 dh_installcatalogs:111 dh_installmanpages:203
+#: dh_installdocs:239 dh_installcatalogs:111 dh_installmanpages:203
 #: dh_installxfonts:89 dh_installlogcheck:57
 msgid "AUTHOR"
 msgstr "AUTEUR"
@@ -203,7 +203,7 @@ msgstr "AUTEUR"
 #: dh_installwm:102 dh_installdeb:101 dh_builddeb:86 dh_gencontrol:81
 #: dh_install:259 dh_makeshlibs:191 dh_fixperms:115 dh_listpackages:36
 #: dh_installman:218 dh_testroot:34 dh_movefiles:170 dh_suidregister:125
-#: dh_installchangelogs:133 dh_installdocs:240 dh_installmanpages:205
+#: dh_installchangelogs:133 dh_installdocs:241 dh_installmanpages:205
 #: dh_installxfonts:91
 msgid "Joey Hess <joeyh@debian.org>"
 msgstr "Joey Hess <joeyh@debian.org>"
@@ -2044,12 +2044,13 @@ msgstr ""
 
 # type: textblock
 #: debhelper.pod:252
+#, fuzzy
 msgid ""
 "Unless otherwise indicated, all debhelper documentation assumes that you are "
-"using the most recent compatability level, and in most cases does not "
-"indicate if the behavior is different in an earlier compatability level, so "
-"if you are not using the most recent compatability level, you're advised to "
-"read below for notes about what is different in earlier compatability levels."
+"using the most recent compatibility level, and in most cases does not "
+"indicate if the behavior is different in an earlier compatibility level, so "
+"if you are not using the most recent compatibility level, you're advised to "
+"read below for notes about what is different in earlier compatibility levels."
 msgstr ""
 "Sauf indication contraire, toute la documentation de debhelper suppose "
 "l'utilisation du niveau de compatibilité le plus récent, et, dans la plupart "