Author: rra
Date: 2007-10-15 03:05:06 +0200 (Mon, 15 Oct 2007)
New Revision: 958

Modified:
   trunk/checks/infofiles
   trunk/debian/changelog
   trunk/testset/manpages/debian/rules
Log:
* checks/infofiles:
  + [RA] Emacs 22 now allows embedded images in info files, so accept
    and ignore PNG files in the info directory.  More image types may be
    needed.  Thanks, Andreas Metzler.  (Closes: #438602)

Modified: trunk/checks/infofiles
===================================================================
--- trunk/checks/infofiles      2007-10-15 00:59:02 UTC (rev 957)
+++ trunk/checks/infofiles      2007-10-15 01:05:06 UTC (rev 958)
@@ -80,6 +80,9 @@
     next unless ($perm =~ m,^[\-l],o)
            and ($path =~ m,^usr/share/info/, or $path =~ m,^usr/info/,);
 
+    # Analyze the file names making sure the documents are named properly.
+    # Note that Emacs 22 added support for images in info files, so we have to
+    # accept those and ignore them.  Just ignore .png files for now.
     my @fname_pieces = split /\./, $fname;
     my $ext = pop @fname_pieces;
     if ($ext eq "gz") { # ok!
@@ -93,6 +96,8 @@
                }
            }
        }
+    } elsif ($ext eq 'png') {
+        next;
     } else {
        push (@fname_pieces, $ext);
        tag "info-document-not-compressed", "$file";

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2007-10-15 00:59:02 UTC (rev 957)
+++ trunk/debian/changelog      2007-10-15 01:05:06 UTC (rev 958)
@@ -17,6 +17,10 @@
       thumbnail databases.  Thanks, Paul Wise.  (Closes: #438202)
     + [RA] Warn about .DS_Store files, used by Mac OS X to store extended
       folder attributes.  Thanks, Paul Wise.  (Closes: #438203)
+  * checks/infofiles:
+    + [RA] Emacs 22 now allows embedded images in info files, so accept
+      and ignore PNG files in the info directory.  More image types may be
+      needed.  Thanks, Andreas Metzler.  (Closes: #438602)
   * checks/nmu.desc:
     + [RA] Remove obsolete note about binary NMUs.  Patch from Thijs
       Kinkhorst.  (Closes: #437925)
@@ -24,7 +28,7 @@
   * collection/changelog-file{.desc,}:
     + [RA] Collect NEWS.Debian as well as changelog.
 
- -- Russ Allbery <[EMAIL PROTECTED]>  Sun, 14 Oct 2007 17:56:35 -0700
+ -- Russ Allbery <[EMAIL PROTECTED]>  Sun, 14 Oct 2007 18:05:02 -0700
 
 lintian (1.23.34) unstable; urgency=low
 

Modified: trunk/testset/manpages/debian/rules
===================================================================
--- trunk/testset/manpages/debian/rules 2007-10-15 00:59:02 UTC (rev 957)
+++ trunk/testset/manpages/debian/rules 2007-10-15 01:05:06 UTC (rev 958)
@@ -63,6 +63,7 @@
        gzip -c9 <foo.info >$(tmp)/usr/share/info/foo.info.gz
        gzip -c1 </dev/null >$(tmp)/usr/share/info/bar.gz
        install -m644 foo.info $(tmp)/usr/share/info/baz.broken.gz
+       touch $(tmp)/usr/share/info/image.png
 
        install -d $(tmp)/usr/share/doc/manpages
        cp debian/changelog $(tmp)/usr/share/doc/manpages/changelog


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to