From 68225779d1337336707c33c0265fc537ae256813 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 18 Jan 2013 01:09:43 -0700 Subject: =?UTF-8?q?*=20Merge=20from=20Debian=20unstable,=20pulling=20in=20?= =?UTF-8?q?new=20translations=20and=20fixes.=20*=20Add=20linux-headers=20t?= =?UTF-8?q?o=20/etc/kernel/postinst.d/apt-auto-removal=20guard.=20*=20Cata?= =?UTF-8?q?lan=20(Jordi=20Mallach)=20*=20Drop=20a=20confusing=20non-breaki?= =?UTF-8?q?ng=20space.=20Closes:=20#691024=20*=20Thai=20(Theppitak=20Karoo?= =?UTF-8?q?nboonyanan).=20Closes:=20#691613=20*=20Vietnamese=20(Tr?= =?UTF-8?q?=E1=BA=A7n=20Ng=E1=BB=8Dc=20Qu=C3=A2n).=20Closes:=20#693773=20*?= =?UTF-8?q?=20Fix=20Plural=20forms=20in=20German,=20French,=20Japanese=20a?= =?UTF-8?q?nd=20Portuguese=20=20=20translations.=20Thanks=20to=20Jakub=20W?= =?UTF-8?q?ilk=20for=20reporting=20these=20errors.=20*=20apt-pkg/packagema?= =?UTF-8?q?nager.cc:=20=20=20-=20do=20not=20do=20lock-step=20configuration?= =?UTF-8?q?=20for=20a=20M-A:same=20package=20if=20it=20isn't=20=20=20=20?= =?UTF-8?q?=20unpacked=20yet=20in=20SmartConfigure=20and=20do=20not=20unpa?= =?UTF-8?q?ck=20a=20M-A:same=20package=20=20=20=20=20again=20in=20SmartUnP?= =?UTF-8?q?ack=20if=20we=20have=20already=20configured=20it=20(LP:=20#1062?= =?UTF-8?q?503)=20*=20apt-pkg/depcache.cc:=20=20=20-=20don't=20call=20Mark?= =?UTF-8?q?Install=20with=20the=20FromUser=20flag=20set=20for=20packages?= =?UTF-8?q?=20=20=20=20=20which=20are=20dependencies=20of=20APT::Never-Mar?= =?UTF-8?q?kAuto-Sections=20matchers=20=20=20-=20no=20mode=20changes=20sho?= =?UTF-8?q?uld=20obviously=20be=20ok=20for=20pkgDepCache::IsModeChangeOk?= =?UTF-8?q?=20*=20cmdline/apt-get.cc:=20=20=20-=20do=20not=20call=20Mark{I?= =?UTF-8?q?nstall,Delete}=20from=20the=20autoremove=20code=20with=20=20=20?= =?UTF-8?q?=20=20the=20FromUser=20bit=20set=20to=20avoid=20modifying=20the?= =?UTF-8?q?=20auto-installed=20bit=20*=20apt-pkg/algorithms.cc:=20=20=20-?= =?UTF-8?q?=20ensure=20pkgProblemResolver=20calls=20MarkDelete=20without?= =?UTF-8?q?=20FromUser=20set=20=20=20=20=20so=20that=20it=20can't=20overru?= =?UTF-8?q?le=20holds=20and=20the=20protection=20flag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * change permissions of /var/log/apt/term.log to 0640 (LP: #975199) * apt-pkg/algorithms.cc: - fix package-pointer array memory leak in ResolveByKeepInternal() * Portuguese (Américo Monteiro) (Closes: #686975) * handle packages without a mandatory architecture (debian-policy §5.3) by introducing a pseudo-architecture 'none' so that the small group of users with these packages can get right of them without introducing too much hassle for other users (Closes: #686346) * merged the latest debian-sid fixes Correct fi translation for hash sum mismatches (lp:420403) --- test/integration/test-bug-604222-new-and-autoremove | 2 +- test/integration/test-bug-618848-always-respect-user-requests | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test/integration') diff --git a/test/integration/test-bug-604222-new-and-autoremove b/test/integration/test-bug-604222-new-and-autoremove index 5820fb0dc..ea73c5775 100755 --- a/test/integration/test-bug-604222-new-and-autoremove +++ b/test/integration/test-bug-604222-new-and-autoremove @@ -51,7 +51,7 @@ Building dependency tree... MarkInstall 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=1 + MarkDelete libvtk5.4 [ i386 ] < none -> 5.4.2-8 > ( libs ) FU=0 The following extra packages will be installed: libavcodec52 libopenal-dev The following NEW packages will be installed: diff --git a/test/integration/test-bug-618848-always-respect-user-requests b/test/integration/test-bug-618848-always-respect-user-requests index 5148be640..1ebadf280 100755 --- a/test/integration/test-bug-618848-always-respect-user-requests +++ b/test/integration/test-bug-618848-always-respect-user-requests @@ -16,11 +16,11 @@ setupaptarchive testequal 'Reading package lists... Building dependency tree... MarkDelete libdb4.8 [ i386 ] < 1.0 > ( other ) FU=1 - MarkDelete exim4-daemon-light [ i386 ] < 1.0 > ( other ) FU=1 + MarkDelete exim4-daemon-light [ i386 ] < 1.0 > ( other ) FU=0 MarkInstall exim4-daemon-heavy [ i386 ] < none -> 1.0 > ( other ) FU=0 Ignore MarkInstall of libdb4.8 [ i386 ] < 1.0 > ( other ) as its mode (Delete) is protected MarkDelete exim4-daemon-heavy [ i386 ] < none -> 1.0 > ( other ) FU=0 - MarkDelete exim4 [ i386 ] < 1.0 > ( other ) FU=1 + MarkDelete exim4 [ i386 ] < 1.0 > ( other ) FU=0 The following packages will be REMOVED: exim4 exim4-daemon-light libdb4.8 MarkDelete exim4 [ i386 ] < 1.0 > ( other ) FU=1 -- cgit v1.2.3