Fix the test suite again

Gbp-Dch: ignore

diff --git a/test/integration/test-allow-scores-for-all-dependency-types b/test/integration/test-allow-scores-for-all-dependency-types
index 56cfc9a6948e6e8835d44f7b7cb53f4cf2efb3a5..30cc2fc93bbdec284b6d2d1a989c600468d0bd30 100755 (executable)
--- 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...
 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
   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...
 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
   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 f5a5b123e7280213002e22f377b912b3a0aadef1..701b10c3efca4749156cf21f082da880681f6fad 100755 (executable)
--- 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...
 
 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
   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...
 
 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
   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...
 
 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
   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 80f699ef3b168098359054ccab499950779042cf..3c159811dca05ebcd01b289913df4730c0b1e167 100755 (executable)
--- 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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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 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
   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 3b5fa20c4e02587f6b15c5c183af9476ff671a53..e910c70cb5f354bcbe0d9acdd2a242eb8f6f0294 100755 (executable)
--- 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 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
   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.
 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
   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
   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
   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 401b521a5a41391499439ac7958cdcb3cdabb415..af839155595c23173e6fc27787bf3b5e20fd3aae 100755 (executable)
--- 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...
 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
   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...
 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
   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...
 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
   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...
 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
   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 552330d81dce5a6590e1d2b4cc6e1ce86698ec53..1709af7f2f312274d11cd583312cc2217b0bb9b4 100755 (executable)
--- 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...
 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
   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...
 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
   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 18eab79c23ebffe88b6b2d2595493012df191208..8424b10b756c53d6623c5502899aa55897109cdb 100755 (executable)
--- 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 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
   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.
 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
   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 dae0fa81d7d1b72b2a8f62bd3f6bd83750702684..d9bc0c3f27c911dcec90cea8b767ecddbfe1c43a 100755 (executable)
--- 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...
 
 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
   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 ab41d8f2ac976f803c7df38c8c8120f9eaca9aa3..502ade92c4525bca839a8e340132a0e0d4ad6d58 100755 (executable)
--- 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'
 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
   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 8a835a6db270f00cf97f015e6fd4af5fb93d2718..78c4eae646af289cef694fb5bd44fe996e05a47b 100755 (executable)
--- 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...
 
 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
   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 29f98550ce0349cab8b7efd9d7772ac5f4df564f..21878ebf060168c70513fbccec108da2839c6ed5 100755 (executable)
--- 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...
 
 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:
   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 eb6e1a33190b2f5dc15a1e482339eb59509ae2d6..1523b81e02c0a55e54f53837756d64e8ff0d9e3a 100755 (executable)
--- 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...
 
 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
   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 bf42f57fd8e7f18de6427aff6be22aa05945f36b..6d43d99431556b105384231e556e6f9248599019 100755 (executable)
--- 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...
 
 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
   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'
 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
   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'
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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 56071f184063486e3e659052e1772223ff329c42..b8821126f29d611286990daf305585c7b514c5fa 100755 (executable)
--- 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...
 
 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
   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 50c682d435a403ad3dc4a66a061e37befc9475d4..86a852c32ccef4f595af3c7e852b2b32f59dbddb 100755 (executable)
--- 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...
        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
   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 15964a270b6d49fc7422ffaddab43eeba88da4b8..a465e5234f74d4cfd33af58e54f7b8ccd25c9747 100755 (executable)
--- 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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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 4d6114637cf10fafa6b9cc745abf8adbd7f9c14c..a7d9d4054f48790673f404167044c57139b86ad8 100755 (executable)
--- 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...
 
 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
   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...
 
 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
   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...
 
 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
   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 6a0c924e29c6c402372b0ab7ac345e70a6a622c3..f30789ea660ed26095b0006e7a334a2c2ec6e062 100755 (executable)
--- 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...
 
 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
   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...
 
 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
   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...
 
 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
   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 2c791ca19659999c86992c54c16af7629e25beb2..2eb479c177efcaf350fc3a784c78ff5e2224303f 100755 (executable)
--- 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...
 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
   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...
 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
   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...
 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
   foo
 The following NEW packages will be installed:
   foo $1


@@ -89,7 +89,7 @@ testneedsfooallgood() {
        solveableinsinglearch1 $1
        testsuccessequal "Reading package lists...
 Building dependency tree...
        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
   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...
 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
   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...
 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
   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...
 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
   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...
 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
   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 a266e35eddabf9fe5d03cce2d8c1b5ea899d03e3..58e5b462aba50ff455a2e5c9a037cb2cf4c1061c 100755 (executable)
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -27,7 +27,7 @@ setupaptarchive
 
 testsuccessequal 'Reading package lists...
 Building dependency tree...
 
 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
   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...
 
 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
   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...
 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
   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...
 
        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
   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...
 
        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
   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...
 #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
   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...
 
        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
   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...
 
        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
   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 f61862912ede9728e175d75ed15332ffb93ae9d6..7741563e3a0c81a1a080aeab8526a8d6cd5e0c3b 100755 (executable)
--- 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...
 
 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
 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...
 
 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
   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...
 
 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
   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 85a302fb1a64e2ed106374e4991e2fa809d9f9b4..e6da2e1518ff6d6c74b68643b764d04ec364e873 100755 (executable)
--- 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...
 
 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
   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
 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
   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
 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
   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
 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
   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
 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
   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 7e4f8f34b62e2fc2e92d77144b560f411c25edbf..e7f8c28e7456440ce3ec84d7119a00d45f3b8b7b 100755 (executable)
--- 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...
 
 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
   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 5f67c019165b0ef244bd4ed038e0c7a672d7d238..11c120c53d842e9632a630287283ca080105d8e8 100755 (executable)
--- 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...
 
 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
   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 510a8e0780a2593599957c63a803099fb8d82041..1790e838183b9bebb19e58b633e4d408ba173a32 100755 (executable)
--- 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...
 
 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)
    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...
 
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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'
 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)
    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 e3dfd0c2ac86c645579bc4013be7fd1c73253533..f6635a4d6765834b4fbfc57442580ae539f22602 100755 (executable)
--- 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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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 192ed5efc520ab1c395eba2152de5fa5c5ba1bee..2fc67096ef6003d6ffbbb490799aab097ce22e5a 100755 (executable)
--- 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...
 
 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
   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...
 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
   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...
 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
   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...
 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
   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...
 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
   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...
 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
   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 7067713e8762ff6c382ac25f74e6bf587e1a9501..6e0a530256a39832c1772bedde109b01f372d5b9 100755 (executable)
--- 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...
 # 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
   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 3f02316f47ba91750ad1e97642b6b0718b6bb96f..2d1cfcd9f88673956f3bf75296f959787b224392 100755 (executable)
--- 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...
 
 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
   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...
 
 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
   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...
 
 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
   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...
 
 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
   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 269038d0feb889b89bf15de931801b0243de68fb..9eab1cbfdc683a3b297c9fec15b6f2e7fd2f76fd 100755 (executable)
--- 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...
 
 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
   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...
 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
   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 ae121cf4ee246c2d07d1bf48e000703ca1af45a4..cdc187d159ec766926ac8a87a2468c875c05f98e 100755 (executable)
--- 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
 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
   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
 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
   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
 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
   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
 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
   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
 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
   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
 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
   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 ff1f3b077e4b1fa961adaa7f8f58112b2dd6e374..57fd0e2346ec40e948a62dd28fff8a1dce38b3d1 100755 (executable)
--- 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...
 
 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
   xserver-xorg-video-intel
 The following packages will be upgraded:
   xserver-xorg-core xserver-xorg-video-intel