[SCM] Debian package checker branch, master, updated. 2.3.4-107-g4e950a9
The following commit has been merged in the master branch:
commit 694b64b460f3a626ffccaf605d5d572415913186
Author: Raphael Geissert <atomo64@gmail.com>
Date: Mon Apr 12 12:19:44 2010 -0500
Sort the output of the colons and letter output format tests
Lintian now has an unpredictable output order, which requires its
output to be sorted before validating it.
diff --git a/t/tests/lintian-output-colons/desc b/t/tests/lintian-output-colons/desc
index 673bea4..1ee38be 100644
--- a/t/tests/lintian-output-colons/desc
+++ b/t/tests/lintian-output-colons/desc
@@ -4,5 +4,5 @@ Type: non-native
Version: 1.0+dsfg-1.1
Skeleton: pedantic
Options: --pedantic -I -E --exp-output format=colons --show-overrides
-Sort: no
+Output-Format: colons
Description: Test Lintian colon-separated output format
diff --git a/t/tests/lintian-output-colons/tags b/t/tests/lintian-output-colons/tags
index 8548528..4add9f9 100644
--- a/t/tests/lintian-output-colons/tags
+++ b/t/tests/lintian-output-colons/tags
@@ -1,18 +1,18 @@
-tag:P:pedantic:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:debian-control-has-unusual-field-spacing:line 11:
-tag:I:wishlist:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:binary-control-field-duplicates-source:field "section" in package lintian-output-colons:
-tag:W:minor:certain:O:lintian-output-colons:1.0+dsfg-1.1:source:source:dfsg-version-misspelled:1.0+dsfg-1.1:dfsg-version-misspelled 1.0*
-tag:W:normal:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:maintainer-upload-has-incorrect-version-number:1.0+dsfg-1.1:
-tag:P:pedantic:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:direct-changes-in-diff-but-no-patch-system:Changes:
-tag:P:pedantic:wild-guess:O:lintian-output-colons:1.0+dsfg-1.1:all:binary:no-upstream-changelog::no-upstream-changelog
-tag:E:serious:wild-guess::lintian-output-colons:1.0+dsfg-1.1:all:binary:possible-gpl-code-linked-with-openssl::
-tag:I:minor:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:description-synopsis-might-not-be-phrased-properly::
-tag:I:wishlist:wild-guess::lintian-output-colons:1.0+dsfg-1.1:all:binary:description-possibly-contains-homepage:http\://www.example.com/.:
tag:E:important:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:new-essential-package::
-tag:P:pedantic:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:no-homepage-field::
tag:E:serious:certain::lintian-output-colons:1.0+dsfg-1.1:all:binary:dir-in-usr-local:usr/local/share/:
tag:E:serious:certain::lintian-output-colons:1.0+dsfg-1.1:all:binary:dir-in-usr-local:usr/local/share/lintian/:
tag:E:serious:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:dir-or-file-in-var-lock:var/lock/lintian/:
-tag:I:wishlist:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:package-contains-empty-directory:usr/local/share/lintian/:
-tag:W:normal:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:binary-without-manpage:usr/bin/script:
+tag:E:serious:wild-guess::lintian-output-colons:1.0+dsfg-1.1:all:binary:possible-gpl-code-linked-with-openssl::
+tag:I:minor:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:description-synopsis-might-not-be-phrased-properly::
tag:I:normal:wild-guess::lintian-output-colons:1.0+dsfg-1.1:all:binary:desktop-entry-limited-to-environments:/usr/share/applications/script.desktop:
+tag:I:wishlist:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:binary-control-field-duplicates-source:field "section" in package lintian-output-colons:
+tag:I:wishlist:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:package-contains-empty-directory:usr/local/share/lintian/:
+tag:I:wishlist:wild-guess::lintian-output-colons:1.0+dsfg-1.1:all:binary:description-possibly-contains-homepage:http\://www.example.com/.:
+tag:P:pedantic:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:debian-control-has-unusual-field-spacing:line 11:
+tag:P:pedantic:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:direct-changes-in-diff-but-no-patch-system:Changes:
tag:P:pedantic:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:example-unusual-interpreter:./usr/share/doc/lintian-output-colons/examples/example #!/usr/bin/foo:
+tag:P:pedantic:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:no-homepage-field::
+tag:P:pedantic:wild-guess:O:lintian-output-colons:1.0+dsfg-1.1:all:binary:no-upstream-changelog::no-upstream-changelog
+tag:W:minor:certain:O:lintian-output-colons:1.0+dsfg-1.1:source:source:dfsg-version-misspelled:1.0+dsfg-1.1:dfsg-version-misspelled 1.0*
+tag:W:normal:certain::lintian-output-colons:1.0+dsfg-1.1:source:source:maintainer-upload-has-incorrect-version-number:1.0+dsfg-1.1:
+tag:W:normal:possible::lintian-output-colons:1.0+dsfg-1.1:all:binary:binary-without-manpage:usr/bin/script:
diff --git a/t/tests/lintian-output-letter/desc b/t/tests/lintian-output-letter/desc
index 1447227..a716056 100644
--- a/t/tests/lintian-output-letter/desc
+++ b/t/tests/lintian-output-letter/desc
@@ -4,5 +4,5 @@ Type: non-native
Version: 1.0+dsfg-1.1
Skeleton: pedantic
Options: --pedantic -I -E --exp-output format=letterqualifier --show-overrides
-Sort: no
+Output-Format: letter
Description: Test Lintian letter qualifier output format
diff --git a/t/tests/lintian-output-letter/tags b/t/tests/lintian-output-letter/tags
index 9e5285d..4203dc5 100644
--- a/t/tests/lintian-output-letter/tags
+++ b/t/tests/lintian-output-letter/tags
@@ -1,18 +1,18 @@
-P[P!]: lintian-output-letter source: debian-control-has-unusual-field-spacing line 11
-I[W!]: lintian-output-letter source: binary-control-field-duplicates-source field "section" in package lintian-output-letter
-O[M!]: lintian-output-letter source: dfsg-version-misspelled 1.0+dsfg-1.1
-W[N!]: lintian-output-letter source: maintainer-upload-has-incorrect-version-number 1.0+dsfg-1.1
-P[P!]: lintian-output-letter source: direct-changes-in-diff-but-no-patch-system Changes
-O[P?]: lintian-output-letter: no-upstream-changelog
-E[S?]: lintian-output-letter: possible-gpl-code-linked-with-openssl
-I[M ]: lintian-output-letter: description-synopsis-might-not-be-phrased-properly
-I[W?]: lintian-output-letter: description-possibly-contains-homepage http://www.example.com/.
E[I ]: lintian-output-letter: new-essential-package
-P[P ]: lintian-output-letter: no-homepage-field
+E[S ]: lintian-output-letter: dir-or-file-in-var-lock var/lock/lintian/
E[S!]: lintian-output-letter: dir-in-usr-local usr/local/share/
E[S!]: lintian-output-letter: dir-in-usr-local usr/local/share/lintian/
-E[S ]: lintian-output-letter: dir-or-file-in-var-lock var/lock/lintian/
-I[W ]: lintian-output-letter: package-contains-empty-directory usr/local/share/lintian/
-W[N ]: lintian-output-letter: binary-without-manpage usr/bin/script
+E[S?]: lintian-output-letter: possible-gpl-code-linked-with-openssl
+I[M ]: lintian-output-letter: description-synopsis-might-not-be-phrased-properly
I[N?]: lintian-output-letter: desktop-entry-limited-to-environments /usr/share/applications/script.desktop
+I[W ]: lintian-output-letter: package-contains-empty-directory usr/local/share/lintian/
+I[W!]: lintian-output-letter source: binary-control-field-duplicates-source field "section" in package lintian-output-letter
+I[W?]: lintian-output-letter: description-possibly-contains-homepage http://www.example.com/.
+O[M!]: lintian-output-letter source: dfsg-version-misspelled 1.0+dsfg-1.1
+O[P?]: lintian-output-letter: no-upstream-changelog
P[P ]: lintian-output-letter: example-unusual-interpreter ./usr/share/doc/lintian-output-letter/examples/example #!/usr/bin/foo
+P[P ]: lintian-output-letter: no-homepage-field
+P[P!]: lintian-output-letter source: debian-control-has-unusual-field-spacing line 11
+P[P!]: lintian-output-letter source: direct-changes-in-diff-but-no-patch-system Changes
+W[N ]: lintian-output-letter: binary-without-manpage usr/bin/script
+W[N!]: lintian-output-letter source: maintainer-upload-has-incorrect-version-number 1.0+dsfg-1.1
--
Debian package checker
Reply to: