diff options
| author | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-04-01 13:57:22 +0200 |
| commit | 8a1c9010137a8c49d9808f2db34b9ee277138986 (patch) | |
| tree | 5ec5c0103cb896407d8c9542fac0ec8ab3313602 /test/integration/test-very-tight-loop-configure-with-unpacking-new-packages | |
| parent | fa55ccaa85ca8f85251300f5c5f574edc0c3ca71 (diff) | |
| parent | 417e83d0d79637266e04c98189c62ce85bcdf737 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
apt-pkg/deb/dpkgpm.cc
debian/apt.auto-removal.sh
debian/changelog
vendor/debian/sources.list.in
Diffstat (limited to 'test/integration/test-very-tight-loop-configure-with-unpacking-new-packages')
| -rwxr-xr-x | test/integration/test-very-tight-loop-configure-with-unpacking-new-packages | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages index 5856cd744..c1d454f88 100755 --- a/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages +++ b/test/integration/test-very-tight-loop-configure-with-unpacking-new-packages @@ -39,9 +39,9 @@ Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-core:amd64 on libreoffice Inst libreoffice-common [3] (4 sid [all]) [] Inst ure (4 sid [amd64]) Conf ure (4 sid [amd64]) -Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice-common (4 sid [all]) Conf libreoffice-core (4 sid [amd64]) +Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice (4 sid [amd64])' 'Reading package lists... Building dependency tree... The following NEW packages will be installed: @@ -55,7 +55,7 @@ Inst libreoffice-core [3] (4 sid [amd64]) [libreoffice-common:amd64 on libreoffi Inst libreoffice-common [3] (4 sid [all]) [] Inst ure (4 sid [amd64]) Conf ure (4 sid [amd64]) -Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice-common (4 sid [all]) Conf libreoffice-core (4 sid [amd64]) +Conf libreoffice-style-galaxy (4 sid [amd64]) Conf libreoffice (4 sid [amd64])' aptget dist-upgrade -s |