r372: * dh_installmanpages: don't install files that start with .#* -- these

     are CVS files..

diff --git a/debian/changelog b/debian/changelog
index 5109994cde7e9abfd54141a378cf312275ea2df7..19e79f761ab2512769a8917f834112a19a3930fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (2.1.11) unstable; urgency=low
+
+  * dh_installmanpages: don't install files that start with .#* -- these
+    are CVS files..
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 21 Sep 2000 11:58:52 -0700
+
 debhelper (2.1.10) unstable; urgency=low
 
   * Modified to allow no spaces between control file field name and value

diff --git a/dh_installmanpages b/dh_installmanpages
index aff70b141609c9503b4219ba70f0cb2d2e472537..e8f00bfe915e8721a449bc079f68f43393277fea 100755 (executable)
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -17,8 +17,8 @@ sub find_man {
        # Does its filename look like a man page?
        # .ex files are examples installed by deb-make,
        # we don't want those, or .in files, which are
-       # from configure.
-       if (! (-f $_ && /^.*\.[1-9].*$/ && ! /\.(ex|in)$/)) {
+       # from configure, nor do we want CVS .#* files.
+       if (! (-f $_ && /^.*\.[1-9].*$/ && ! /\.(ex|in)$/) && ! /^\.#/) {
                return;
        }