summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtest/integration/test-allow-scores-for-all-dependency-types4
-rwxr-xr-xtest/integration/test-architecture-specification-parsing6
-rwxr-xr-xtest/integration/test-bug-470115-new-and-tighten-recommends18
-rwxr-xr-xtest/integration/test-bug-604222-new-and-autoremove6
-rwxr-xr-xtest/integration/test-bug-612099-multiarch-conflicts8
-rwxr-xr-xtest/integration/test-bug-612557-garbage-upgrade4
-rwxr-xr-xtest/integration/test-bug-613420-new-garbage-dependency4
-rwxr-xr-xtest/integration/test-bug-686346-package-missing-architecture2
-rwxr-xr-xtest/integration/test-bug-709560-set-candidate-release2
-rwxr-xr-xtest/integration/test-bug-723586-any-stripped-in-single-arch2
-rwxr-xr-xtest/integration/test-bug-723705-tagfile-truncates-fields2
-rwxr-xr-xtest/integration/test-bug-735967-lib32-to-i386-unavailable2
-rwxr-xr-xtest/integration/test-bug-758153-versioned-provides-support16
-rwxr-xr-xtest/integration/test-bug-multiarch-upgrade2
-rwxr-xr-xtest/integration/test-essential-force-loopbreak2
-rwxr-xr-xtest/integration/test-handling-broken-orgroups8
-rwxr-xr-xtest/integration/test-ignore-provides-if-versioned-breaks6
-rwxr-xr-xtest/integration/test-ignore-provides-if-versioned-conflicts6
-rwxr-xr-xtest/integration/test-multiarch-allowed16
-rwxr-xr-xtest/integration/test-multiarch-foreign16
-rwxr-xr-xtest/integration/test-parse-all-archs-into-cache6
-rwxr-xr-xtest/integration/test-prefer-higher-priority-providers10
-rwxr-xr-xtest/integration/test-prefer-native-architecture-over-higher-priority2
-rwxr-xr-xtest/integration/test-prevent-markinstall-multiarch-same-versionscrew2
-rwxr-xr-xtest/integration/test-release-candidate-switching30
-rwxr-xr-xtest/integration/test-specific-architecture-dependencies14
-rwxr-xr-xtest/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings12
-rwxr-xr-xtest/integration/test-ubuntu-bug-6149932
-rwxr-xr-xtest/integration/test-ubuntu-bug-806274-install-suggests8
-rwxr-xr-xtest/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first4
-rwxr-xr-xtest/integration/test-unpack-different-version-unpacked12
-rwxr-xr-xtest/integration/test-xorg-break-providers2
32 files changed, 118 insertions, 118 deletions
diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types
index 56cfc9a69..30cc2fc93 100755
--- a/test/integration/test-allow-scores-for-all-dependency-types
+++ b/test/integration/test-allow-scores-for-all-dependency-types
@@ -115,7 +115,7 @@ Inst baz (2 unversioned [amd64])
Conf baz (2 unversioned [amd64])' aptget install baz -st unversioned
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following packages will be REMOVED:
bar
@@ -139,7 +139,7 @@ Inst baz (2 unversioned [amd64])
Conf baz (2 unversioned [amd64])' aptget install baz -st unversioned
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following packages will be REMOVED:
bar
diff --git a/test/integration/test-architecture-specification-parsing b/test/integration/test-architecture-specification-parsing
index f5a5b123e..701b10c3e 100755
--- a/test/integration/test-architecture-specification-parsing
+++ b/test/integration/test-architecture-specification-parsing
@@ -28,7 +28,7 @@ setupaptarchive
testsuccessequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
foo pkg-arch-foo
@@ -48,7 +48,7 @@ Conf pkg-arch-no-foo (1.0 stable [${NATIVE}])" aptget install pkg-arch-no-foo -s
testsuccessequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
foo pkg-arch-foo-unrelated-no
@@ -60,7 +60,7 @@ Conf pkg-arch-foo-unrelated-no (1.0 stable [${NATIVE}])" aptget install pkg-arch
testsuccessequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
foo pkg-arch-foo-unrelated-no2
diff --git a/test/integration/test-bug-470115-new-and-tighten-recommends b/test/integration/test-bug-470115-new-and-tighten-recommends
index 80f699ef3..3c159811d 100755
--- a/test/integration/test-bug-470115-new-and-tighten-recommends
+++ b/test/integration/test-bug-470115-new-and-tighten-recommends
@@ -49,7 +49,7 @@ setupaptarchive
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
cool
The following packages will be upgraded:
cool tighten-cool
@@ -61,7 +61,7 @@ Conf tighten-cool (2 unstable [all])' aptget install tighten-cool -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
stuff
The following packages will be upgraded:
stuff tighten-coolorstuff
@@ -73,7 +73,7 @@ Conf tighten-coolorstuff (2 unstable [all])' aptget install tighten-coolorstuff
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
cool
The following packages will be upgraded:
cool tighten-coolorstuff2
@@ -85,7 +85,7 @@ Conf tighten-coolorstuff2 (2 unstable [all])' aptget install tighten-coolorstuff
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
cool
The following packages will be upgraded:
cool newrec-cool
@@ -97,7 +97,7 @@ Conf newrec-cool (2 unstable [all])' aptget install newrec-cool -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
super
The following NEW packages will be installed:
super
@@ -111,7 +111,7 @@ Conf super (2 unstable [all])' aptget install newrec-super -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
cool
The following packages will be upgraded:
cool newrec-coolorstuff
@@ -123,7 +123,7 @@ Conf newrec-coolorstuff (2 unstable [all])' aptget install newrec-coolorstuff -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
stuff
The following packages will be upgraded:
cool-gone stuff
@@ -135,7 +135,7 @@ Conf stuff (2 unstable [all])' aptget install cool-gone -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
super
The following NEW packages will be installed:
super
@@ -151,7 +151,7 @@ Conf super-overtake (2 unstable [all])' aptget install super-overtake -s
# the first option in an or-group should be the preferred oneā€¦
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
cool
The following packages will be upgraded:
cool upgrade-over-new
diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove
index 3b5fa20c4..e910c70cb 100755
--- a/test/integration/test-bug-604222-new-and-autoremove
+++ b/test/integration/test-bug-604222-new-and-autoremove
@@ -40,7 +40,7 @@ Reading state information...
The following package was automatically installed and is no longer required:
libvtk5.4
Use 'apt-get autoremove' to remove it.
-The following extra packages will be installed:
+The following additional packages will be installed:
libavcodec52 libopenal-dev libvtk5.4
The following NEW packages will be installed:
dummy-archive libavcodec52 libopenal-dev
@@ -55,7 +55,7 @@ Building dependency tree...
Reading state information...
1 package was automatically installed and is no longer required.
Use 'apt-get autoremove' to remove it.
-The following extra packages will be installed:
+The following additional packages will be installed:
libavcodec52 libopenal-dev libvtk5.4
The following NEW packages will be installed:
dummy-archive libavcodec52 libopenal-dev
@@ -78,7 +78,7 @@ Building dependency tree...
MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0
MarkKeep libvtk5-dev [ i386 ] < none -> 5.4.2-8 > ( libdevel ) FU=0
MarkDelete libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=0
-The following extra packages will be installed:
+The following additional packages will be installed:
libavcodec52 libopenal-dev
The following NEW packages will be installed:
dummy-archive libavcodec52 libopenal-dev
diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts
index 401b521a5..af8391555 100755
--- a/test/integration/test-bug-612099-multiarch-conflicts
+++ b/test/integration/test-bug-612099-multiarch-conflicts
@@ -41,7 +41,7 @@ Conf foobar (1.0 stable [i386])' aptget install foobar -st stable
testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6:amd64
The following packages will be REMOVED:
libc6
@@ -96,7 +96,7 @@ Conf foobar (1.0 stable [i386])' aptget install foobar/stable -st testing
testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6:amd64
The following packages will be REMOVED:
libc6
@@ -145,7 +145,7 @@ Conf foobar-same (1.0 stable [i386])' aptget install foobar-same -st stable
testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6-same:amd64
The following NEW packages will be installed:
foobar-same:amd64 libc6-same:amd64
@@ -206,7 +206,7 @@ Conf foobar-same (1.0 stable [i386])' aptget install foobar-same/stable -st test
testsuccessequal 'Reading package lists...
Building dependency tree...
Reading state information...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6-same:amd64
The following packages will be REMOVED:
libc6-same
diff --git a/test/integration/test-bug-612557-garbage-upgrade b/test/integration/test-bug-612557-garbage-upgrade
index 552330d81..1709af7f2 100755
--- a/test/integration/test-bug-612557-garbage-upgrade
+++ b/test/integration/test-bug-612557-garbage-upgrade
@@ -20,7 +20,7 @@ testmarkedauto python-uno openoffice.org-common
testfailureequal 'Reading package lists...
Building dependency tree...
Reading state information...
-The following extra packages will be installed:
+The following additional packages will be installed:
libreoffice-common
The following packages will be REMOVED:
openoffice.org-common openoffice.org-emailmerge
@@ -38,7 +38,7 @@ testmarkedauto python-uno openoffice.org-common openoffice.org-emailmerge
testfailureequal 'Reading package lists...
Building dependency tree...
Reading state information...
-The following extra packages will be installed:
+The following additional packages will be installed:
libreoffice-common
The following packages will be REMOVED:
openoffice.org-common openoffice.org-emailmerge
diff --git a/test/integration/test-bug-613420-new-garbage-dependency b/test/integration/test-bug-613420-new-garbage-dependency
index 18eab79c2..8424b10b7 100755
--- a/test/integration/test-bug-613420-new-garbage-dependency
+++ b/test/integration/test-bug-613420-new-garbage-dependency
@@ -24,7 +24,7 @@ Reading state information...
The following packages were automatically installed and are no longer required:
libreoffice-officebean openoffice.org-officebean
Use 'apt-get autoremove' to remove them.
-The following extra packages will be installed:
+The following additional packages will be installed:
libreoffice-core libreoffice-officebean openoffice.org-officebean
The following packages will be REMOVED:
openoffice.org-core
@@ -40,7 +40,7 @@ Building dependency tree...
Reading state information...
2 packages were automatically installed and are no longer required.
Use 'apt-get autoremove' to remove them.
-The following extra packages will be installed:
+The following additional packages will be installed:
libreoffice-core libreoffice-officebean openoffice.org-officebean
The following packages will be REMOVED:
openoffice.org-core
diff --git a/test/integration/test-bug-686346-package-missing-architecture b/test/integration/test-bug-686346-package-missing-architecture
index dae0fa81d..d9bc0c3f2 100755
--- a/test/integration/test-bug-686346-package-missing-architecture
+++ b/test/integration/test-bug-686346-package-missing-architecture
@@ -27,7 +27,7 @@ Conf pkgc (1 unstable [amd64])' aptget install pkgc -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
pkgb
The following packages will be REMOVED:
pkgb:none
diff --git a/test/integration/test-bug-709560-set-candidate-release b/test/integration/test-bug-709560-set-candidate-release
index ab41d8f2a..502ade92c 100755
--- a/test/integration/test-bug-709560-set-candidate-release
+++ b/test/integration/test-bug-709560-set-candidate-release
@@ -25,7 +25,7 @@ testsuccessequal "Reading package lists...
Building dependency tree...
Selected version '2.0' (experimental [all]) for 'foo'
Selected version '2.1' (experimental [all]) for 'foo-dep' because of 'foo'
-The following extra packages will be installed:
+The following additional packages will be installed:
foo-dep
The following NEW packages will be installed:
foo foo-dep
diff --git a/test/integration/test-bug-723586-any-stripped-in-single-arch b/test/integration/test-bug-723586-any-stripped-in-single-arch
index 8a835a6db..78c4eae64 100755
--- a/test/integration/test-bug-723586-any-stripped-in-single-arch
+++ b/test/integration/test-bug-723586-any-stripped-in-single-arch
@@ -17,7 +17,7 @@ setupaptarchive
INSTALLLOG='Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
python3
The following NEW packages will be installed:
python3-gnupg
diff --git a/test/integration/test-bug-723705-tagfile-truncates-fields b/test/integration/test-bug-723705-tagfile-truncates-fields
index 29f98550c..21878ebf0 100755
--- a/test/integration/test-bug-723705-tagfile-truncates-fields
+++ b/test/integration/test-bug-723705-tagfile-truncates-fields
@@ -12,7 +12,7 @@ aptget install --print-uris -y cdebconf-newt-terminal cdebconf-gtk-terminal 2>&1
testfileequal filename.log "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
cdebconf-gtk-udeb cdebconf-newt-udeb cdebconf-udeb libc6-udeb
libglib2.0-udeb libgtk2.0-0-udeb libvte9-udeb
The following NEW packages will be installed:
diff --git a/test/integration/test-bug-735967-lib32-to-i386-unavailable b/test/integration/test-bug-735967-lib32-to-i386-unavailable
index eb6e1a331..1523b81e0 100755
--- a/test/integration/test-bug-735967-lib32-to-i386-unavailable
+++ b/test/integration/test-bug-735967-lib32-to-i386-unavailable
@@ -78,7 +78,7 @@ Conf lib32nss-mdns (0.10-6 unstable [amd64])' aptget dist-upgrade -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libfoo libfoo-bin:i386
The following NEW packages will be installed:
foo libfoo libfoo-bin:i386
diff --git a/test/integration/test-bug-758153-versioned-provides-support b/test/integration/test-bug-758153-versioned-provides-support
index bf42f57fd..6d43d9943 100755
--- a/test/integration/test-bug-758153-versioned-provides-support
+++ b/test/integration/test-bug-758153-versioned-provides-support
@@ -157,7 +157,7 @@ Conf cool-webapp (4 experimental [all])' aptget install cool-webapp foreign-webs
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
baz:i386 foo
@@ -182,7 +182,7 @@ E: Unable to correct problems, you have held broken packages.' aptget install ba
testsuccessequal "Reading package lists...
Building dependency tree...
Selected version '2' (experimental [amd64]) for 'baz'
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
baz foo
@@ -195,7 +195,7 @@ Conf baz (2 experimental [amd64])" aptget install baz/experimental -s -q=0
testsuccessequal "Reading package lists...
Building dependency tree...
Selected version '2' (experimental [i386]) for 'baz:i386'
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
baz:i386 foo
@@ -219,7 +219,7 @@ E: Unable to correct problems, you have held broken packages.' aptget install ba
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
next
The following NEW packages will be installed:
needsrealnext next
@@ -231,7 +231,7 @@ Conf needsrealnext (2 unstable [amd64])' aptget install needsrealnext -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
next
The following NEW packages will be installed:
needsrealnext:i386 next
@@ -243,7 +243,7 @@ Conf needsrealnext:i386 (2 unstable [i386])' aptget install needsrealnext:i386 -
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
virtualnext2
The following NEW packages will be installed:
needsnext2 virtualnext2
@@ -255,7 +255,7 @@ Conf needsnext2 (2 unstable [amd64])' aptget install needsnext2 -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
virtualnext2
The following NEW packages will be installed:
needsnext2:i386 virtualnext2
@@ -267,7 +267,7 @@ Conf needsnext2:i386 (2 unstable [i386])' aptget install needsnext2:i386 -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
virtualnext3
The following NEW packages will be installed:
needsnext3 virtualnext3
diff --git a/test/integration/test-bug-multiarch-upgrade b/test/integration/test-bug-multiarch-upgrade
index 56071f184..b8821126f 100755
--- a/test/integration/test-bug-multiarch-upgrade
+++ b/test/integration/test-bug-multiarch-upgrade
@@ -18,7 +18,7 @@ setupaptarchive
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libcups2
The following packages will be upgraded:
libcups2 libcups2:i386
diff --git a/test/integration/test-essential-force-loopbreak b/test/integration/test-essential-force-loopbreak
index 50c682d43..86a852c32 100755
--- a/test/integration/test-essential-force-loopbreak
+++ b/test/integration/test-essential-force-loopbreak
@@ -27,7 +27,7 @@ testforcebreak() {
rm -f rootdir/var/lib/apt/extended_states
testfailureequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
sysvinit
The following NEW packages will be installed:
systemd-sysv
diff --git a/test/integration/test-handling-broken-orgroups b/test/integration/test-handling-broken-orgroups
index 15964a270..a465e5234 100755
--- a/test/integration/test-handling-broken-orgroups
+++ b/test/integration/test-handling-broken-orgroups
@@ -25,7 +25,7 @@ setupaptarchive
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
cool
The following NEW packages will be installed:
cool coolstuff
@@ -37,7 +37,7 @@ Conf coolstuff (1.0-1 unstable [all])' aptget install coolstuff -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
stuff
The following NEW packages will be installed:
coolstuff2 stuff
@@ -72,7 +72,7 @@ Conf coolstuff-brokenrec (1.0-1 unstable [all])' aptget install coolstuff-broken
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
stuff
The following NEW packages will be installed:
coolstuff-conflict stuff
@@ -84,7 +84,7 @@ Conf coolstuff-conflict (1.0-1 unstable [all])' aptget install coolstuff-conflic
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
extrastuff
The following NEW packages will be installed:
coolstuff-provided extrastuff
diff --git a/test/integration/test-ignore-provides-if-versioned-breaks b/test/integration/test-ignore-provides-if-versioned-breaks
index 4d6114637..a7d9d4054 100755
--- a/test/integration/test-ignore-provides-if-versioned-breaks
+++ b/test/integration/test-ignore-provides-if-versioned-breaks
@@ -57,7 +57,7 @@ Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
foo-breaker-3 foo-provider
@@ -95,7 +95,7 @@ Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-prov
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo-foreign:amd64
The following NEW packages will be installed:
foo-foreign-breaker-3 foo-foreign-provider
@@ -133,7 +133,7 @@ Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider f
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo-same foo-same:amd64
The following NEW packages will be installed:
foo-same-breaker-3 foo-same-provider
diff --git a/test/integration/test-ignore-provides-if-versioned-conflicts b/test/integration/test-ignore-provides-if-versioned-conflicts
index 6a0c924e2..f30789ea6 100755
--- a/test/integration/test-ignore-provides-if-versioned-conflicts
+++ b/test/integration/test-ignore-provides-if-versioned-conflicts
@@ -57,7 +57,7 @@ Conf foo-provider (1.0 unstable [i386])' aptget install foo-provider foo-breaker
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
foo-breaker-3 foo-provider
@@ -95,7 +95,7 @@ Conf foo-foreign-provider (1.0 unstable [i386])' aptget install foo-foreign-prov
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo-foreign:amd64
The following NEW packages will be installed:
foo-foreign-breaker-3 foo-foreign-provider
@@ -133,7 +133,7 @@ Conf foo-same-provider (1.0 unstable [i386])' aptget install foo-same-provider f
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo-same foo-same:amd64
The following NEW packages will be installed:
foo-same-breaker-3 foo-same-provider
diff --git a/test/integration/test-multiarch-allowed b/test/integration/test-multiarch-allowed
index 2c791ca19..2eb479c17 100755
--- a/test/integration/test-multiarch-allowed
+++ b/test/integration/test-multiarch-allowed
@@ -40,7 +40,7 @@ The following information may help to resolve the situation:
solveableinsinglearch0() {
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
foo needsfoo
@@ -53,7 +53,7 @@ Conf needsfoo (1 unstable [amd64])' aptget install needsfoo -s
solveableinsinglearch0
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo:i386
The following NEW packages will be installed:
foo:i386 needsfoo:i386
@@ -74,7 +74,7 @@ E: Unable to correct problems, you have held broken packages." aptget install ne
solveableinsinglearch1() {
testsuccessequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
foo $1
@@ -89,7 +89,7 @@ testneedsfooallgood() {
solveableinsinglearch1 $1
testsuccessequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
foo $1:i386
@@ -168,7 +168,7 @@ Conf hatesfoonative (1 unstable [amd64])' aptget install foo:i386 hatesfoonative
solveableinsinglearch3() {
testsuccessequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
coolfoo
The following NEW packages will be installed:
coolfoo needscoolfoo
@@ -179,7 +179,7 @@ Conf coolfoo (1 unstable [amd64])
Conf needscoolfoo (1 unstable [amd64])" aptget install needscoolfoo -s
testsuccessequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
coolfoo
The following NEW packages will be installed:
coolfoo coolfoover needscoolfoo
@@ -196,7 +196,7 @@ The following packages have unmet dependencies:
E: Unable to correct problems, you have held broken packages." aptget install needscoolfooany -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
coolfoo
The following NEW packages will be installed:
coolfoo needscoolfoover0
@@ -207,7 +207,7 @@ Conf coolfoo (1 unstable [amd64])
Conf needscoolfoover0 (1 unstable [amd64])' aptget install needscoolfoover0 -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
coolfoo coolfoover
The following NEW packages will be installed:
coolfoo coolfoover needscoolfoover1
diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
index a266e35ed..58e5b462a 100755
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -27,7 +27,7 @@ setupaptarchive
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
cool-foo:i386 foo
@@ -59,7 +59,7 @@ Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:armel -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
bar
The following NEW packages will be installed:
bar cool-bar:i386
@@ -103,7 +103,7 @@ Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386
satisfiable_in_singlearch() {
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
cool-foo foo
@@ -125,7 +125,7 @@ Conf cool-foo (1.0 unstable [amd64])' aptget install cool-foo:amd64 foo:amd64 -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
bar
The following NEW packages will be installed:
bar cool-bar
@@ -158,7 +158,7 @@ Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s -q
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
cool-foo-x64 foo
@@ -199,7 +199,7 @@ hatersgonnahate 'foo:i386'
#FIXME: do not work in single-arch as i386 isn't known at cache generation time
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
cool-foo-x32 foo
@@ -211,7 +211,7 @@ Conf cool-foo-x32 (1.0 unstable [amd64])' aptget install cool-foo-x32 -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
bar
The following NEW packages will be installed:
bar cool-bar-x32
@@ -223,7 +223,7 @@ Conf cool-bar-x32 (1.0 unstable [amd64])' aptget install cool-bar-x32 -s -q=0
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
bar
The following NEW packages will be installed:
bar cool-bar-x64
diff --git a/test/integration/test-parse-all-archs-into-cache b/test/integration/test-parse-all-archs-into-cache
index f61862912..7741563e3 100755
--- a/test/integration/test-parse-all-archs-into-cache
+++ b/test/integration/test-parse-all-archs-into-cache
@@ -34,7 +34,7 @@ Building dependency tree...' aptget check -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libfoo1
The following packages will be REMOVED:
foo:amd64
@@ -49,7 +49,7 @@ Conf foo (1 unstable [i386])' aptget install foo -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libfoo1
The following packages will be REMOVED:
foo:amd64 libfoo1:amd64
@@ -65,7 +65,7 @@ Conf foo (2 experimental [i386])' aptget install foo/experimental -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo libfoo1
The following packages will be REMOVED:
foo:amd64
diff --git a/test/integration/test-prefer-higher-priority-providers b/test/integration/test-prefer-higher-priority-providers
index 85a302fb1..e6da2e151 100755
--- a/test/integration/test-prefer-higher-priority-providers
+++ b/test/integration/test-prefer-higher-priority-providers
@@ -15,7 +15,7 @@ setupaptarchive
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
awesome foo
@@ -39,7 +39,7 @@ testsuccessequal "Reading package lists...
Building dependency tree...
Package 'bar' is not installed, so not removed
Package 'baz' is not installed, so not removed
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
The following NEW packages will be installed:
awesome foo
@@ -52,7 +52,7 @@ Conf awesome (1 unstable [all])" aptget install awesome bar- baz- -s
testsuccessequal "Reading package lists...
Building dependency tree...
Package 'foo' is not installed, so not removed
-The following extra packages will be installed:
+The following additional packages will be installed:
bar
The following NEW packages will be installed:
awesome bar
@@ -66,7 +66,7 @@ testsuccessequal "Reading package lists...
Building dependency tree...
Package 'foo' is not installed, so not removed
Package 'baz' is not installed, so not removed
-The following extra packages will be installed:
+The following additional packages will be installed:
bar
The following NEW packages will be installed:
awesome bar
@@ -80,7 +80,7 @@ testsuccessequal "Reading package lists...
Building dependency tree...
Package 'foo' is not installed, so not removed
Package 'bar' is not installed, so not removed
-The following extra packages will be installed:
+The following additional packages will be installed:
baz
The following NEW packages will be installed:
awesome baz
diff --git a/test/integration/test-prefer-native-architecture-over-higher-priority b/test/integration/test-prefer-native-architecture-over-higher-priority
index 7e4f8f34b..e7f8c28e7 100755
--- a/test/integration/test-prefer-native-architecture-over-higher-priority
+++ b/test/integration/test-prefer-native-architecture-over-higher-priority
@@ -14,7 +14,7 @@ setupaptarchive
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
m4
The following NEW packages will be installed:
autoconf m4
diff --git a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
index 5f67c0191..11c120c53 100755
--- a/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
+++ b/test/integration/test-prevent-markinstall-multiarch-same-versionscrew
@@ -83,7 +83,7 @@ E: Unable to correct problems, you have held broken packages.' aptget install de
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libsame3:i386 libsame3
The following NEW packages will be installed:
depender3 libsame3
diff --git a/test/integration/test-release-candidate-switching b/test/integration/test-release-candidate-switching
index 510a8e078..1790e8381 100755
--- a/test/integration/test-release-candidate-switching
+++ b/test/integration/test-release-candidate-switching
@@ -56,7 +56,7 @@ setupaptarchive
testfailureequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.1-1+sid)
amarok-utils (2.3.1-1+sid)
libc6 (2.11.2-7+sid)
@@ -75,7 +75,7 @@ E: Trivial Only specified but this is not a trivial operation." aptget install a
testfailureequal "Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -97,7 +97,7 @@ Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -119,7 +119,7 @@ Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-null'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-null'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok-null'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -143,7 +143,7 @@ Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-null'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -173,7 +173,7 @@ Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-higher'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-higher'
Selected version '5:4.6.0+exp' (experimental [i386]) for 'phonon-backend-xine' because of 'amarok-higher'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok-higher'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -197,7 +197,7 @@ Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-null2'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-null2'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok-null2'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -221,7 +221,7 @@ Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-xine'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-xine'
Selected version '5:4.6.0+exp' (experimental [i386]) for 'phonon-backend-xine' because of 'amarok-xine'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok-xine'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -245,7 +245,7 @@ Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-xine2'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-xine2'
Selected version '5:4.20.0+exp' (experimental [i386]) for 'phonon-backend-null' because of 'amarok-xine2'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok-xine2'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -270,7 +270,7 @@ Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because
Selected version '5:4.6.0+exp' (experimental [i386]) for 'phonon-backend-xine3' because of 'amarok-xine3'
Selected version '2.0' (experimental [all]) for 'intermediatepkg' because of 'phonon-backend-xine3'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok-xine3'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
intermediatepkg (2.0)
@@ -296,7 +296,7 @@ Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-xine4'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-xine4'
Selected version '5:4.20.0+exp' (experimental [i386]) for 'phonon-backend-null' because of 'amarok-xine4'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok-xine4'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -320,7 +320,7 @@ Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-broken'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-broken'
Selected version '5:4.20.0+exp' (experimental [i386]) for 'phonon-backend-null' because of 'amarok-broken'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok-broken'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -343,7 +343,7 @@ Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-recommends'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-recommends'
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-utils' because of 'amarok-recommends'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
amarok-utils (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
@@ -365,7 +365,7 @@ testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-recommends'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-recommends'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
Recommended packages:
amarok-utils (2.3.1-1+sid)
@@ -386,7 +386,7 @@ testfailureequal "Reading package lists...
Building dependency tree...
Selected version '2.3.2-2+exp' (experimental [i386]) for 'amarok-recommends2'
Selected version '2.3.2-2+exp' (experimental [all]) for 'amarok-common' because of 'amarok-recommends2'
-The following extra packages will be installed:
+The following additional packages will be installed:
amarok-common (2.3.2-2+exp)
libc6 (2.11.2-7+sid)
libmtp8 (0.3.1+sid)
diff --git a/test/integration/test-specific-architecture-dependencies b/test/integration/test-specific-architecture-dependencies
index e3dfd0c2a..f6635a4d6 100755
--- a/test/integration/test-specific-architecture-dependencies
+++ b/test/integration/test-specific-architecture-dependencies
@@ -35,7 +35,7 @@ setupaptarchive
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6:i386
The following NEW packages will be installed:
libc6:i386 pre-depender
@@ -47,7 +47,7 @@ Conf pre-depender (1 unstable [all])' aptget install pre-depender -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6:i386
The following NEW packages will be installed:
depender libc6:i386
@@ -59,7 +59,7 @@ Conf depender (1 unstable [all])' aptget install depender -s
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6:i386
The following NEW packages will be installed:
depender-x32:i386 libc6:i386
@@ -71,7 +71,7 @@ Conf depender-x32:i386 (1 unstable [i386])' aptget install depender-x32:i386 -s
testequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6:i386
The following NEW packages will be installed:
depender-x32 libc6:i386
@@ -83,7 +83,7 @@ Conf depender-x32 (1 unstable [amd64])' aptget install depender-x32:amd64 -s
testequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6
The following NEW packages will be installed:
depender-x64 libc6
@@ -95,7 +95,7 @@ Conf depender-x64 (1 unstable [amd64])' aptget install depender-x64:amd64 -s
testequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6
The following NEW packages will be installed:
depender-x64:i386 libc6
@@ -267,7 +267,7 @@ configarchitecture 'amd64'
testequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libc6
The following NEW packages will be installed:
depender-x64 libc6
diff --git a/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings b/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
index 192ed5efc..2fc67096e 100755
--- a/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
+++ b/test/integration/test-ubuntu-bug-1130419-prefer-installed-ma-same-siblings
@@ -22,7 +22,7 @@ setupaptarchive
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libmesa:i386
The following NEW packages will be installed:
libmesa:i386 steam:i386
@@ -33,7 +33,7 @@ Conf libmesa:i386 (1 stable [i386])
Conf steam:i386 (1 stable [i386])' aptget install steam -st stable
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libmesa:i386
The following NEW packages will be installed:
libmesa:i386 steam:i386
@@ -47,7 +47,7 @@ cp rootdir/var/lib/dpkg/status default-status.dpkg
insertinstalledpackage 'libmesa' 'amd64' '1' 'Multi-Arch: same'
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libmesa:i386
The following NEW packages will be installed:
libmesa:i386 steam:i386
@@ -58,7 +58,7 @@ Conf libmesa:i386 (1 stable [i386])
Conf steam:i386 (1 stable [i386])' aptget install steam -st stable
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libmesa libmesa:i386
The following NEW packages will be installed:
libmesa:i386 steam:i386
@@ -78,7 +78,7 @@ Conflicts: libmesa
Multi-Arch: same'
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libmesa-lts:i386
The following NEW packages will be installed:
libmesa-lts:i386 steam:i386
@@ -89,7 +89,7 @@ Conf libmesa-lts:i386 (1 stable [i386])
Conf steam:i386 (1 stable [i386])' aptget install steam -st stable
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libmesa-lts libmesa-lts:i386
The following NEW packages will be installed:
libmesa-lts:i386 steam:i386
diff --git a/test/integration/test-ubuntu-bug-614993 b/test/integration/test-ubuntu-bug-614993
index 7067713e8..6e0a53025 100755
--- a/test/integration/test-ubuntu-bug-614993
+++ b/test/integration/test-ubuntu-bug-614993
@@ -10,7 +10,7 @@ setupaptarchive
# test success
UPGRADE="Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
libdrm-intel1 libdrm-nouveau1 libmtdev1 libutouch-grail1 libx11-xcb1
libxcb-aux0 libxcb-dri2-0 libxfont1 xserver-common xserver-xorg-core
xserver-xorg-input-evdev xserver-xorg-input-mouse
diff --git a/test/integration/test-ubuntu-bug-806274-install-suggests b/test/integration/test-ubuntu-bug-806274-install-suggests
index 3f02316f4..2d1cfcd9f 100755
--- a/test/integration/test-ubuntu-bug-806274-install-suggests
+++ b/test/integration/test-ubuntu-bug-806274-install-suggests
@@ -17,7 +17,7 @@ setupaptarchive
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
bar foo
Suggested packages:
baz
@@ -34,7 +34,7 @@ Conf bar (1.0 unstable [i386])' aptget install apt -s --install-recommends --no-
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
bar baz foo
The following NEW packages will be installed:
apt bar baz foo
@@ -50,7 +50,7 @@ Conf baz (1.0 unstable [i386])' aptget install apt -s --install-recommends --ins
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
foo
Suggested packages:
baz
@@ -66,7 +66,7 @@ Conf apt (0.8.15 unstable [i386])' aptget install apt -s --no-install-recommends
testsuccessequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
baz foo
Recommended packages:
bar
diff --git a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first
index 269038d0f..9eab1cbfd 100755
--- a/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first
+++ b/test/integration/test-ubuntu-bug-835625-multiarch-lockstep-installed-first
@@ -16,7 +16,7 @@ setupaptarchive
testequalor2 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
apt:i386 libsame:i386
The following NEW packages will be installed:
libsame
@@ -30,7 +30,7 @@ Conf libsame (2 unstable [amd64]) [apt:i386 ]
Inst apt:i386 [1] (2 unstable [i386])
Conf apt:i386 (2 unstable [i386])' 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
apt:i386 libsame:i386
The following NEW packages will be installed:
libsame
diff --git a/test/integration/test-unpack-different-version-unpacked b/test/integration/test-unpack-different-version-unpacked
index ae121cf4e..cdc187d15 100755
--- a/test/integration/test-unpack-different-version-unpacked
+++ b/test/integration/test-unpack-different-version-unpacked
@@ -32,7 +32,7 @@ insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same' '' 'install ok
testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
libqtcore4:i386
The following packages will be upgraded:
libqtcore4:i386
@@ -48,7 +48,7 @@ insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same' '' 'install o
testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
libqtcore4
The following packages will be upgraded:
libqtcore4
@@ -64,7 +64,7 @@ insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same'
testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
libqtcore4:i386
The following packages will be upgraded:
libqtcore4:i386
@@ -80,7 +80,7 @@ insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same'
testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
libqtcore4
The following packages will be upgraded:
libqtcore4
@@ -96,7 +96,7 @@ insertinstalledpackage 'libqtcore4' 'i386' '1' 'Multi-Arch: same' '' 'install ok
testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
libqtcore4:i386
The following packages will be upgraded:
libqtcore4:i386
@@ -111,7 +111,7 @@ insertinstalledpackage 'libqtcore4' 'amd64' '1' 'Multi-Arch: same' '' 'install o
testsuccessequal 'Reading package lists...
Building dependency tree...
Correcting dependencies... Done
-The following extra packages will be installed:
+The following additional packages will be installed:
libqtcore4
The following packages will be upgraded:
libqtcore4
diff --git a/test/integration/test-xorg-break-providers b/test/integration/test-xorg-break-providers
index ff1f3b077..57fd0e234 100755
--- a/test/integration/test-xorg-break-providers
+++ b/test/integration/test-xorg-break-providers
@@ -15,7 +15,7 @@ setupaptarchive
testfailureequal 'Reading package lists...
Building dependency tree...
-The following extra packages will be installed:
+The following additional packages will be installed:
xserver-xorg-video-intel
The following packages will be upgraded:
xserver-xorg-core xserver-xorg-video-intel