[ciderwebmail] 01/02: Fix avoid license-mine .ico files (unsupported by exiftool).

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository ciderwebmail.

commit d204505b4d06215fba041bcd99028d471cc92d5e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon May 9 17:58:13 2016 +0200

    Fix avoid license-mine .ico files (unsupported by exiftool).
---
 debian/copyright_hints | 1 -
 debian/license-miner   | 4 ++--
 debian/rules           | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/copyright_hints b/debian/copyright_hints
index 453a26d..0c83345 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -75,7 +75,6 @@ Files: Changes
  lib/CiderWebmail/Util.pm
  lib/CiderWebmail/View/Petal.pm
  lib/CiderWebmail/View/RFC822.pm
- root/favicon.ico.metadata_dump
  root/locale/CiderWebmail.pot
  root/locale/Makefile
  root/locale/de/LC_MESSAGES/CiderWebmail.po
diff --git a/debian/license-miner b/debian/license-miner
index 7081357..52f5b4d 100755
--- a/debian/license-miner
+++ b/debian/license-miner
@@ -87,7 +87,7 @@ by prefixing the path with "exif:".
 
 misc. images and fonts.
 
-Used by default for extensions F<gif>, F<icc>, F<ico>, F<jpeg>, F<.jpg>, F<.pdf>, F<.pfa>, F<.pfb>, F<.png>, F<psd>, F<svg>.
+Used by default for extensions F<gif>, F<icc>, F<jpeg>, F<.jpg>, F<.pdf>, F<.pfa>, F<.pfb>, F<.png>, F<psd>, F<svg>.
 
 Beware that some OpenType fonts are not TrueType but Type1,
 which may fail to parse correctly based on suffix detection.
@@ -166,7 +166,7 @@ my $dispatch = {
 		}
 	},
 	# exif: misc. images and fonts
-	'((?<=\Aexif:).*|\A.*\.(?:gif|icc|ico|jpeg|jpg|pfa|pfb|pdf|png|psd|svg))$' => sub {
+	'((?<=\Aexif:).*|\A.*\.(?:gif|icc|jpeg|jpg|pfa|pfb|pdf|png|psd|svg))$' => sub {
 		my $file = check_infile(shift);
 		say "exif: $file" if ($verbose);
 		my $exifTool = new Image::ExifTool;
diff --git a/debian/rules b/debian/rules
index 020c51e..e4259c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,8 +87,9 @@ CDBS_SUGGESTS_$(pkg) = $(suggests)
 #  * skip binary graphics files known to not contain metadata
 CDBS_BUILD_DEPENDS +=, libregexp-assemble-perl, libimage-exiftool-perl
 CDBS_BUILD_DEPENDS +=, libfont-ttf-perl
-copyright-check-binary-ext-regex = gif|ico|jpeg|jpg|png|ttf|otf
-DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^((.*/)?[^/]+\.($(copyright-check-binary-ext-regex))|debian/(changelog|copyright(|_hints|_newhints)))$$
+copyright-check-binary-ext-regex = gif|jpeg|jpg|png|ttf|otf
+copyright-check-skip-ext-regex = ico
+DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^((.*/)?[^/]+\.($(copyright-check-binary-ext-regex)|$(copyright-check-skip-ext-regex))|debian/(changelog|copyright(|_hints|_newhints)))$$
 debian/stamp-copyright-check: debian/stamp-extract-copyright
 debian/stamp-extract-copyright:
 	find * -type f -regextype posix-extended \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ciderwebmail.git