[SCM] Debian package checker branch, master, updated. 2.3.4-33-g4d7501e
The following commit has been merged in the master branch:
commit 07f736960414dfc03f101b2c0433505b702bdb36
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Wed Mar 24 13:26:41 2010 +0000
Fix testset architecture-neutralising for the new .changes output style
diff --git a/t/tests/distribution-multiple-bad/post_test b/t/tests/distribution-multiple-bad/post_test
index acd8ec4..c671e1a 100755
--- a/t/tests/distribution-multiple-bad/post_test
+++ b/t/tests/distribution-multiple-bad/post_test
@@ -1 +1 @@
-s/_[^.]*\.changes/_arch.changes/
+s/_[^ _]* changes/_arch changes/
diff --git a/t/tests/distribution-multiple-bad/tags b/t/tests/distribution-multiple-bad/tags
index 7cc3bfe..350c358 100644
--- a/t/tests/distribution-multiple-bad/tags
+++ b/t/tests/distribution-multiple-bad/tags
@@ -1,4 +1,4 @@
-E: distribution-multiple-bad_1.0_amd64 changes: bad-distribution-in-changes-file bar
-E: distribution-multiple-bad_1.0_amd64 changes: bad-distribution-in-changes-file foo
-E: distribution-multiple-bad_1.0_amd64 changes: bad-distribution-in-changes-file foo-backportss
-E: distribution-multiple-bad_1.0_amd64 changes: multiple-distributions-in-changes-file stable foo-backportss bar foo
+E: distribution-multiple-bad_1.0_arch changes: bad-distribution-in-changes-file bar
+E: distribution-multiple-bad_1.0_arch changes: bad-distribution-in-changes-file foo
+E: distribution-multiple-bad_1.0_arch changes: bad-distribution-in-changes-file foo-backportss
+E: distribution-multiple-bad_1.0_arch changes: multiple-distributions-in-changes-file stable foo-backportss bar foo
diff --git a/t/tests/generic-empty/post_test b/t/tests/generic-empty/post_test
index acd8ec4..c671e1a 100644
--- a/t/tests/generic-empty/post_test
+++ b/t/tests/generic-empty/post_test
@@ -1 +1 @@
-s/_[^.]*\.changes/_arch.changes/
+s/_[^ _]* changes/_arch changes/
diff --git a/t/tests/generic-empty/tags b/t/tests/generic-empty/tags
index 97eca4e..d6742e1 100644
--- a/t/tests/generic-empty/tags
+++ b/t/tests/generic-empty/tags
@@ -5,9 +5,9 @@ E: generic-empty source: no-standards-version-field
E: generic-empty: maintainer-address-missing a
E: generic-empty: no-copyright-file
E: generic-empty: package-has-no-description
-E: generic-empty_1.0_amd64 changes: bad-urgency-in-changes-file unknown
-E: generic-empty_1.0_amd64 changes: changed-by-address-malformed a <>
-E: generic-empty_1.0_amd64 changes: changed-by-address-missing a <>
+E: generic-empty_1.0_arch changes: bad-urgency-in-changes-file unknown
+E: generic-empty_1.0_arch changes: changed-by-address-malformed a <>
+E: generic-empty_1.0_arch changes: changed-by-address-missing a <>
W: generic-empty source: changelog-should-mention-nmu
W: generic-empty source: maintainer-not-full-name a
W: generic-empty source: no-section-field-for-source
diff --git a/testset/tags.foo++ b/testset/tags.foo++
index d21136e..efe3f00 100644
--- a/testset/tags.foo++
+++ b/testset/tags.foo++
@@ -13,7 +13,7 @@ E: foo++: debian-changelog-file-contains-debmake-default-email-address he@unknow
E: foo++: debian-changelog-file-uses-obsolete-national-encoding at line 11
E: foo++: no-copyright-file
E: foo++: wrong-debian-qa-address-set-as-maintainer Lintian Maintainer <debian-qa@lists.debian.org>
-E: foo++_5_amd64 changes: changed-by-address-malformed Marc 'HE' Brockschmidt <he@unknown>
+E: foo++_5_arch changes: changed-by-address-malformed Marc 'HE' Brockschmidt <he@unknown>
I: foo++ source: duplicate-short-description foo++ foo++-helper
I: foo++: no-md5sums-control-file
W: foo++ source: ancient-standards-version 3.1.1 (current is 3.8.4)
diff --git a/testset/tags.foo++.sed b/testset/tags.foo++.sed
index acd8ec4..c671e1a 100644
--- a/testset/tags.foo++.sed
+++ b/testset/tags.foo++.sed
@@ -1 +1 @@
-s/_[^.]*\.changes/_arch.changes/
+s/_[^ _]* changes/_arch changes/
diff --git a/testset/tags.scripts b/testset/tags.scripts
index b5b7f15..42d8d4b 100644
--- a/testset/tags.scripts
+++ b/testset/tags.scripts
@@ -20,7 +20,7 @@ E: scripts: shell-script-fails-syntax-check ./usr/bin/sh-broken
E: scripts: suid-perl-script-but-no-perl-suid-dep ./usr/bin/suidperlfoo2
E: scripts: wrong-path-for-interpreter ./usr/bin/lefty-foo (#!/usr/local/bin/lefty != /usr/bin/lefty)
E: scripts: wrong-path-for-interpreter ./usr/bin/rubyfoo (#!/bin/ruby1.8 != /usr/bin/ruby1.8)
-E: scripts_6ds-1ubuntu0.5.10.1_amd64 changes: bad-ubuntu-distribution-in-changes-file unstable
+E: scripts_6ds-1ubuntu0.5.10.1_arch changes: bad-ubuntu-distribution-in-changes-file unstable
I: scripts source: debian-watch-file-should-dversionmangle-not-uversionmangle line 5
I: scripts source: dpatch-missing-description 02_i_dont_have_a_description.patch
I: scripts source: dpatch-missing-description 04_i_dont_have_a_description_either.patch
diff --git a/testset/tags.scripts.sed b/testset/tags.scripts.sed
index acd8ec4..c671e1a 100644
--- a/testset/tags.scripts.sed
+++ b/testset/tags.scripts.sed
@@ -1 +1 @@
-s/_[^.]*\.changes/_arch.changes/
+s/_[^ _]* changes/_arch changes/
--
Debian package checker
Reply to: