[SCM] Debian package checker branch, master, updated. 2.5.11-238-g8cacd18
The following commit has been merged in the master branch:
commit 8cacd18ea51fb7ff39258f40c38f6ee57a5e3d54
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Thu Apr 11 00:09:55 2013 +0200
c/files: Add test for adobe font fragment
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/files b/checks/files
index 6a76f5f..5ba18c8 100644
--- a/checks/files
+++ b/checks/files
@@ -1051,6 +1051,13 @@ foreach my $file ($info->sorted_index) {
if ($line =~ m/^[%\s]*Copyright\s*\(c\)\s*19\d{2}[\-\s]19\d{2}\s*Adobe\s*Systems\s*Incorporated\.?\s*$/i) {
$foundadobeline = 1;
}
+ # If copy pasted from black book they are copyright adobe a few line before
+ # the only place where the startlock is documented is in the black book
+ # copyrighted fragment
+ if ($line =~ m/startlock\s*get\s*exec/) {
+ tag 'font-adobe-copyrighted-fragment-no-credit', $file;
+ last;
+ }
}
close $t1pipe or fail "could not close pipe: $! $?";
}
diff --git a/checks/files.desc b/checks/files.desc
index cb739bb..0e47660 100644
--- a/checks/files.desc
+++ b/checks/files.desc
@@ -979,6 +979,19 @@ Info: This type 1 font file includes some postscript fragment with a
Should this be a false-positive, please override the tag.
Ref: http://wiki.debian.org/qa.debian.org/type1nondfsg
+Tag: font-adobe-copyrighted-fragment-no-credit
+Severity: serious
+Certainty: possible
+Info: This type 1 font file includes some postscript fragment with a
+ non free license of Adobe. In order to check if this tag is genuine
+ please follow the proceedure described in the reference.
+ .
+ Moreover the fragment was likely verbatim copied from black
+ book without any credit to Adobe.
+ .
+ Should this be a false-positive, please override the tag.
+Ref: http://wiki.debian.org/qa.debian.org/type1nondfsg
+
Tag: duplicate-font-file
Severity: normal
Certainty: possible
diff --git a/debian/changelog b/debian/changelog
index 78ef2d0..cad12a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ lintian (2.5.12) UNRELEASED; urgency=low
- dir-or-file-in-build-tree
- dir-or-file-in-etc-opt
- dir-or-file-in-home
+ - font-adobe-copyrighted-fragment-no-credit
- font-package-not-multi-arch-foreign
- illegal-runtime-test-name
- inconsistent-testsuite-field
@@ -84,6 +85,8 @@ lintian (2.5.12) UNRELEASED; urgency=low
a package is empty.
+ [NT] Fix typo of Pre-Depends, thanks to Raúl Benencia for
spotting it. (Closes: #699452)
+ + [NT] Add patch from Bastien Roucariès to check for another
+ adobe font license issues. (Closes: #705175)
* checks/init.d:
+ [NT] Fix regression where Lintian would not properly match
init.d passed to update-rc.d. Thanks to Michael Meskes for
diff --git a/t/tests/files-adobe-font/debian/Makefile b/t/tests/files-adobe-font/debian/Makefile
index 79c39ed..6b48449 100644
--- a/t/tests/files-adobe-font/debian/Makefile
+++ b/t/tests/files-adobe-font/debian/Makefile
@@ -1,4 +1,4 @@
-all: bad.pfb good.pfb
+all: bad.pfb good.pfb badnocredit.pfb badwithadobecode.pfb
%.pfb: %.raw
t1asm $< > $@
diff --git a/t/tests/files-adobe-font/debian/bad.raw b/t/tests/files-adobe-font/debian/bad.raw
index f792d8c..37b5d60 100644
--- a/t/tests/files-adobe-font/debian/bad.raw
+++ b/t/tests/files-adobe-font/debian/bad.raw
@@ -8,7 +8,7 @@
/RD{string currentfile exch readstring pop}executeonly def
-% Below is here to trick Lintian...
+% The statements below are here to trick Lintian...
% Copyright (c) 1987-1990 Adobe Systems Incorporated.
% All Rights Reserved.
diff --git a/t/tests/files-adobe-font/debian/good.raw b/t/tests/files-adobe-font/debian/badnocredit.raw
similarity index 52%
copy from t/tests/files-adobe-font/debian/good.raw
copy to t/tests/files-adobe-font/debian/badnocredit.raw
index fd50247..1270b84 100644
--- a/t/tests/files-adobe-font/debian/good.raw
+++ b/t/tests/files-adobe-font/debian/badnocredit.raw
@@ -1,15 +1,15 @@
%!PS-AdobeFont-1.0: Untitled1 001.000
-%%Title: good
+%%Title: badnocredit
%Version: 001.000
%%CreationDate: Mon Dec 10 21:21:58 2012
-%%Creator: nthykier,,,
-%Copyright: Created by nthykier,,, hand-crafted
+%%Creator: roucaries.bastien,,,
+%Copyright: Created by roucaries.bastien,,, hand-crafted
%%EndComments
/RD{string currentfile exch readstring pop}executeonly def
-% This file has no license issues (bad.raw doesn't either, but
-% we pretend it does).
+% The code below is here to trick Lintian...
+trick { /startlock get exec } def
2 index /CharStrings 2 dict dup begin
diff --git a/t/tests/files-adobe-font/debian/bad.raw b/t/tests/files-adobe-font/debian/badwithadobecode.raw
similarity index 59%
copy from t/tests/files-adobe-font/debian/bad.raw
copy to t/tests/files-adobe-font/debian/badwithadobecode.raw
index f792d8c..4822d8d 100644
--- a/t/tests/files-adobe-font/debian/bad.raw
+++ b/t/tests/files-adobe-font/debian/badwithadobecode.raw
@@ -1,16 +1,17 @@
%!PS-AdobeFont-1.0: Untitled1 001.000
-%%Title: bad
+%%Title: badwithadobecode
%Version: 001.000
%%CreationDate: Mon Dec 10 21:21:58 2012
-%%Creator: nthykier,,,
-%Copyright: Created by nthykier,,, hand-crafted
+%%Creator: roucaries.bastien,,,
+%Copyright: Created by roucaries.bastien,,, hand-crafted
%%EndComments
/RD{string currentfile exch readstring pop}executeonly def
-% Below is here to trick Lintian...
+% The code below is here to trick Lintian...
% Copyright (c) 1987-1990 Adobe Systems Incorporated.
% All Rights Reserved.
+trick { /startlock get exec } def
2 index /CharStrings 2 dict dup begin
diff --git a/t/tests/files-adobe-font/tags b/t/tests/files-adobe-font/tags
index 6a6bd8d..ded07f3 100644
--- a/t/tests/files-adobe-font/tags
+++ b/t/tests/files-adobe-font/tags
@@ -1 +1,3 @@
E: fonts-files-adobe-font: font-adobe-copyrighted-fragment usr/share/lintian/fonts/bad.pfb
+E: fonts-files-adobe-font: font-adobe-copyrighted-fragment usr/share/lintian/fonts/badwithadobecode.pfb
+E: fonts-files-adobe-font: font-adobe-copyrighted-fragment-no-credit usr/share/lintian/fonts/badnocredit.pfb
--
Debian package checker
Reply to: