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) --- debian/apt.auto-removal.sh | 1 + debian/apt.postinst | 2 +- debian/changelog | 68 ++++++++++++++++++++++++++++++++++++---------- 3 files changed, 55 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/debian/apt.auto-removal.sh b/debian/apt.auto-removal.sh index 048e33912..4ada56556 100644 --- a/debian/apt.auto-removal.sh +++ b/debian/apt.auto-removal.sh @@ -84,6 +84,7 @@ for kernel in $kernels; do echo " \"^linux-image-extra-${kernel}$\";" >> "$config_file".dpkg-new echo " \"^linux-signed-image-${kernel}$\";" >> "$config_file".dpkg-new echo " \"^linux-backports-modules-.*-${kernel}$\";" >> "$config_file".dpkg-new + echo " \"^linux-headers-${kernel}$\";" >> "$config_file".dpkg-new done cat >> "$config_file".dpkg-new < Fri, 18 Jan 2013 00:32:14 -0700 + +apt (0.9.7.7) unstable; urgency=low + + [ Program translation updates ] + * Catalan (Jordi Mallach) + * Drop a confusing non-breaking space. Closes: #691024 + * Thai (Theppitak Karoonboonyanan). Closes: #691613 + * Vietnamese (Trần Ngọc Quân). Closes: #693773 + * Fix Plural forms in German, French, Japanese and Portuguese + translations. Thanks to Jakub Wilk for reporting these errors. + + [ David Kalnischkies ] + * apt-pkg/packagemanager.cc: + - do not do lock-step configuration for a M-A:same package if it isn't + unpacked yet in SmartConfigure and do not unpack a M-A:same package + again in SmartUnPack if we have already configured it (LP: #1062503) + * apt-pkg/depcache.cc: + - don't call MarkInstall with the FromUser flag set for packages + which are dependencies of APT::Never-MarkAuto-Sections matchers + - no mode changes should obviously be ok for pkgDepCache::IsModeChangeOk + * cmdline/apt-get.cc: + - do not call Mark{Install,Delete} from the autoremove code with + the FromUser bit set to avoid modifying the auto-installed bit + * apt-pkg/algorithms.cc: + - ensure pkgProblemResolver calls MarkDelete without FromUser set + so that it can't overrule holds and the protection flag + + [ Michael Vogt ] + * change permissions of /var/log/apt/term.log to 0640 (LP: #975199) + + [ Jonathan Thomas ] + * apt-pkg/algorithms.cc: + - fix package-pointer array memory leak in ResolveByKeepInternal() + + -- Michael Vogt Thu, 13 Dec 2012 09:52:19 +0100 + apt (0.9.7.6ubuntu6) raring; urgency=low * merged from the debian-sid branch @@ -202,8 +244,13 @@ apt (0.9.7.5) unstable; urgency=low [ Manpages translation updates ] * Japanese (KURASAWA Nozomu) (Closes: #684435) + * Portuguese (Américo Monteiro) (Closes: #686975) [ David Kalnischkies ] + * 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) * apt-pkg/cdrom.cc: - copy only configured translation files from a CD-ROM and not all available translation files preventing new installs with d-i from @@ -228,11 +275,6 @@ apt (0.9.7.5) unstable; urgency=low - do not warn about files which have a record in the Release file, but are not present on the CD to mirror the behavior of the other methods and to allow uncompressed indexes to be dropped without scaring users - - do not create duplicated flat-archive CD-ROM sources for foreign - architectures on multi-arch CD-ROMs - - do not warn about files which have a record in the Release file, but - are not present on the CD to mirror the behavior of the other methods - and to allow uncompressed indexes to be dropped without scaring users * apt-pkg/pkgcachegen.cc: - do not create 'native' (or now 'none') package structures as a side effect of description translation parsing as it pollutes the cache @@ -1201,7 +1243,6 @@ apt (0.8.16~exp9) experimental; urgency=low commands accepting lists of packages, e.g. policy (Closes: #625960) * apt-pkg/depcache.cc: - prefer native providers over foreigns even if the chain is foreign - LP: #850264. * cmdline/apt-get.cc: - ignore foreign architectures if we check if a provides has only one resolver as it's basically the same for the user, so no need to choose @@ -1484,13 +1525,13 @@ apt (0.8.16~exp5ubuntu1) oneiric; urgency=low apt (0.8.16~exp5) experimental; urgency=low + * merged the latest debian-sid fixes * apt-pkg/makefile: - install sha256.h compat header * apt-pkg/pkgcachegen.{cc,h}: - use ref-to-ptr semantic in NewDepends() to ensure that the libapt does not segfault if the cache is remapped in between (LP: #812862) - (LP: #812862) - fix crash when P.Arch() was used but the cache got remapped * apt-pkg/acquire-item.{cc,h}: - do not check for a "Package" tag in optional index targets @@ -1616,10 +1657,6 @@ apt (0.8.15.10) unstable; urgency=high - show a debug why a package was kept by ResolveByKeep() * doc/manpage-style.xml: - put around email addresses - * apt-pkg/aptconfiguration.cc: - - parse dpkg --print-foreign-architectures correctly in - case archs are separated by newline instead of space, too. - (Closes: #655590) * doc/po/de.po: - apply typo-fix from Michael Basse, thanks! (LP: #900770) * apt-pkg/acquire-item.cc: @@ -1643,8 +1680,8 @@ apt (0.8.15.10) unstable; urgency=high * French: replace "étiquetage" by "épinglage" for "pinning" [ Michael Vogt ] - * merged patch from lp:~uusijani/apt/uusi-branch: - Correct fi translation for hash sum mismatches (LP: #420403) + * merged patch from lp:~uusijani/apt/uusi-branch: + Correct fi translation for hash sum mismatches (lp:420403) Thanks to Jani Uusitalo -- Michael Vogt Tue, 06 Mar 2012 14:14:26 +0100 @@ -6872,7 +6909,7 @@ apt (0.6.46.3-0.2) unstable; urgency=high * Fix FTBFS on most arches (regression from the fix of #400874) -- Andreas Barth Tue, 5 Dec 2006 15:51:22 +0000 - + apt (0.6.46.3-0.1) unstable; urgency=high * Non-maintainer upload with permission of Michael Vogt. @@ -7534,7 +7571,7 @@ apt (0.6.42.2) unstable; urgency=high * Priority high to get the AMD key into testing ASAP. -- Frans Pop Sun, 30 Oct 2005 21:29:11 +0100 - + apt (0.6.42.1) unstable; urgency=low * fix a incorrect example in the apt_prefrences man page @@ -9646,3 +9683,4 @@ apt (0.0.1) unstable; urgency=low * Initial Release. -- Scott K. Ellis Tue, 31 Mar 1998 12:49:28 -0500 + -- cgit v1.2.3