]> git.saurik.com Git - apt.git/log
apt.git
12 years agoFrench updated by Christian Perrier
bubulle@debian.org [Sat, 2 Jun 2012 16:37:54 +0000 (18:37 +0200)] 
French updated by Christian Perrier

12 years agoPolish updated by Robert Luberda. Closes: #675603
bubulle@debian.org [Sat, 2 Jun 2012 16:26:35 +0000 (18:26 +0200)] 
Polish updated by Robert Luberda. Closes: #675603

12 years agoreleasing version 0.9.5.1 0.9.5.1
Michael Vogt [Thu, 24 May 2012 15:27:34 +0000 (17:27 +0200)] 
releasing version 0.9.5.1

12 years agomerged from david
Michael Vogt [Thu, 24 May 2012 15:12:46 +0000 (17:12 +0200)] 
merged from david

12 years ago* doc/apt-cache.8.xml:
Justin B Rye [Thu, 24 May 2012 14:00:53 +0000 (16:00 +0200)] 
* doc/apt-cache.8.xml:
  - three small rewordings for better english sentences

12 years agomerged from David
Michael Vogt [Thu, 24 May 2012 13:59:31 +0000 (15:59 +0200)] 
merged from David

12 years ago* doc/apt-cache.8.xml:
Justin B Rye [Thu, 24 May 2012 13:49:55 +0000 (15:49 +0200)] 
* doc/apt-cache.8.xml:
  - fix a typo as well as adding missing literal markup

12 years ago* doc/*.xml:
Justin B Rye [Thu, 24 May 2012 13:09:49 +0000 (15:09 +0200)] 
* doc/*.xml:
  - remove 'GNU/Linux' from 'Debian systems' strings as Debian
    has more systems than just GNU/Linux nowadays

12 years agofinially do the post-processing of the po's for all non-de
David Kalnischkies [Thu, 24 May 2012 12:58:36 +0000 (14:58 +0200)] 
finially do the post-processing of the po's for all non-de
languages, too, to reduce the amount of fuzzies in them

12 years agouse docbook DTD 4.5 instead of 4.2 to have valid docs
David Kalnischkies [Wed, 23 May 2012 16:20:55 +0000 (18:20 +0200)] 
use docbook DTD 4.5 instead of 4.2 to have valid docs

12 years ago* doc/*.xml:
David Kalnischkies [Wed, 23 May 2012 16:00:32 +0000 (18:00 +0200)] 
* doc/*.xml:
  - mark even more stuff as untranslateable and improve the
    markup here and there (no real text change)

12 years ago* apt-pkg/contrib/fileutl.cc:
David Kalnischkies [Tue, 22 May 2012 16:33:43 +0000 (18:33 +0200)] 
* apt-pkg/contrib/fileutl.cc:
  - dup() given compressed fd in OpenDescriptor if AutoClose
    is disabled as otherwise gzclose() and co will close it

12 years agoreleasing version 0.9.5 0.9.5
Michael Vogt [Tue, 22 May 2012 14:41:53 +0000 (16:41 +0200)] 
releasing version 0.9.5

12 years agomerged from David
Michael Vogt [Tue, 22 May 2012 11:29:25 +0000 (13:29 +0200)] 
merged from David

12 years agomerged from david
Michael Vogt [Tue, 22 May 2012 08:16:10 +0000 (10:16 +0200)] 
merged from david

12 years ago* proofreading of the manpage pot
David Kalnischkies [Mon, 21 May 2012 22:35:57 +0000 (00:35 +0200)] 
* proofreading of the manpage pot
* German manpage translation update (Closes: #673294)

12 years agoMerge my tree and the remote tree (no change, I guess)
bubulle@debian.org [Mon, 21 May 2012 19:53:29 +0000 (21:53 +0200)] 
Merge my tree and the remote tree (no change, I guess)

12 years ago* debian/rules:
David Kalnischkies [Mon, 21 May 2012 17:20:03 +0000 (19:20 +0200)] 
* debian/rules:
  - move internal-solver as 'apt' to his friend dump-solver in
    /usr/lib/apt/solvers to avoid writing a manpage for it

12 years ago* debian/control:
David Kalnischkies [Mon, 21 May 2012 17:14:53 +0000 (19:14 +0200)] 
* debian/control:
  - moving debiandoc-sgml to Build-Depends-Indep was one step too much
    for the buildds as we still build two sgml files in arch:any

12 years ago* apt-pkg/contrib/mmap.cc:
David Kalnischkies [Mon, 21 May 2012 17:12:25 +0000 (19:12 +0200)] 
* apt-pkg/contrib/mmap.cc:
  - have a dummy SyncToFd around in case of ReadOnly access to a
    compressed file as we otherwise on Close() do not delete[] the
    char buffer but munmap() it… (Closes: #673815)

12 years ago* buildlib/inttypes.h.in:
David Kalnischkies [Mon, 21 May 2012 14:50:52 +0000 (16:50 +0200)] 
* buildlib/inttypes.h.in:
  - remove inttypes.h compatibility as providing such a c99 types
    compatibility conflicts with the usage of c99 type long long

12 years agowhatever this script did, it didn't for a long long time
David Kalnischkies [Mon, 21 May 2012 13:16:39 +0000 (15:16 +0200)] 
whatever this script did, it didn't for a long long time
(it creates changelog from cvs)

12 years agoapply the correct metadata (package, version, mail) to all pot and po files
David Kalnischkies [Mon, 21 May 2012 13:13:05 +0000 (15:13 +0200)] 
apply the correct metadata (package, version, mail) to all pot and po files

12 years ago* buildlib/podomain.mak:
David Kalnischkies [Mon, 21 May 2012 13:12:27 +0000 (15:12 +0200)] 
* buildlib/podomain.mak:
  - ensure that all sources end up in the srclist so that we don't
    forget to extract half of the translation strings

12 years agoreleasing version 0.9.4 0.9.4
Michael Vogt [Mon, 21 May 2012 11:47:14 +0000 (13:47 +0200)] 
releasing version 0.9.4

12 years agomerge fix from david for warning during xml build
Michael Vogt [Mon, 21 May 2012 11:33:25 +0000 (13:33 +0200)] 
merge fix from david for warning during xml build

12 years agomerged updated de.po, thanks to Holger Wansing (closes: #672466)
Michael Vogt [Mon, 21 May 2012 10:05:04 +0000 (12:05 +0200)] 
merged updated de.po, thanks to Holger Wansing (closes: #672466)

12 years agomerged from David, uncommited the previous i18n commit first as its part of the merge...
Michael Vogt [Mon, 21 May 2012 09:29:05 +0000 (11:29 +0200)] 
merged from David, uncommited the previous i18n commit first as its part of the merge from David already but for some reason bzr is confused and gives a gazillion of conflicts in doc/po/de.po without the uncommit first

12 years ago* ftparchive/writer.cc:
David Kalnischkies [Mon, 21 May 2012 06:16:50 +0000 (08:16 +0200)] 
* ftparchive/writer.cc:
  - include Contents-* files in Release files (Closes: #673647)

12 years agoadd also <refentryinfo> to the list of unstranslated tags for po4a
David Kalnischkies [Mon, 21 May 2012 06:00:16 +0000 (08:00 +0200)] 
add also <refentryinfo> to the list of unstranslated tags for po4a

12 years agoauto-generate the correct <date> translation
David Kalnischkies [Mon, 21 May 2012 04:13:03 +0000 (06:13 +0200)] 
auto-generate the correct <date> translation

12 years agoprint warnings in release script if xml-linting fails
David Kalnischkies [Mon, 21 May 2012 03:13:13 +0000 (05:13 +0200)] 
print warnings in release script if xml-linting fails
The build was successful, so it doesn't seem to be a problem per-se,
but it is a good idea to correct these errors non-the-less.

12 years agoremove the mode-line from apt.ent to save them from being "translated"
David Kalnischkies [Mon, 21 May 2012 02:58:30 +0000 (04:58 +0200)] 
remove the mode-line from apt.ent to save them from being "translated"

12 years agoadd <refname> and <refentrytitle> to the untranslated list
David Kalnischkies [Mon, 21 May 2012 02:54:47 +0000 (04:54 +0200)] 
add <refname> and <refentrytitle> to the untranslated list

12 years agoin <term> mark all options with <option> and mark <term><option>
David Kalnischkies [Mon, 21 May 2012 02:40:48 +0000 (04:40 +0200)] 
in <term> mark all options with <option> and mark <term><option>
as untranslated for po4a removing ~200 unless "translateable" strings

12 years agoGerman updated (Chris Leick). Closes: #673410
bubulle@debian.org [Sun, 20 May 2012 17:25:26 +0000 (19:25 +0200)] 
German updated (Chris Leick). Closes: #673410

12 years ago* apt-pkg/aptconfiguration.cc:
David Kalnischkies [Sun, 20 May 2012 16:58:37 +0000 (18:58 +0200)] 
* apt-pkg/aptconfiguration.cc:
  - longcode Translation files are saved with encoded underscore,
    so make sure to pick these files up as well for Acquire::Languages

12 years agomove the creation of the manpage-style.xsl file to the rest of the
David Kalnischkies [Sun, 20 May 2012 16:37:14 +0000 (18:37 +0200)] 
move the creation of the manpage-style.xsl file to the rest of the
manpage building instead of doing it at setup time, so we can properly
depend on it

12 years ago* doc/*.xml:
David Kalnischkies [Sun, 20 May 2012 16:24:23 +0000 (18:24 +0200)] 
* doc/*.xml:
  - add a few translator notes and reword some paragraphs to ensure that
    translators and users alike can better understand them (Closes: #669409)

12 years ago* apt-pkg/packagemanager.cc:
David Kalnischkies [Sat, 19 May 2012 21:07:30 +0000 (23:07 +0200)] 
* apt-pkg/packagemanager.cc:
  - do not run into loop on new-pre-depends-breaks (Closes: #673536)

12 years ago* doc/po/de.po:
Chris Leick [Sat, 19 May 2012 16:38:27 +0000 (18:38 +0200)] 
* doc/po/de.po:
  - updated german manpage translation by Chris Leick, thanks!

12 years agofix authenificated→authenticated typo in sources.list manpage
Chris Leick [Sat, 19 May 2012 15:08:48 +0000 (17:08 +0200)] 
fix authenificated→authenticated typo in sources.list manpage

12 years ago* doc/makefile:
David Kalnischkies [Thu, 17 May 2012 20:21:03 +0000 (22:21 +0200)] 
* doc/makefile:
  - build manpages with the correct l10n.gentext.default.language setting
    to get the correct section titles provided by docbook

12 years agoadd spaces around PACKAGE_VERSION to fix FTBFS with -std=c++11
David Kalnischkies [Thu, 17 May 2012 12:21:13 +0000 (14:21 +0200)] 
add spaces around PACKAGE_VERSION to fix FTBFS with -std=c++11

12 years ago* cmdline/apt-get.cc:
David Kalnischkies [Wed, 16 May 2012 14:44:15 +0000 (16:44 +0200)] 
* cmdline/apt-get.cc:
  - use the host architecture, not the build architecture for matching
    of [architecture restrictions] in Build-Depends (Closes: #672927)
*

12 years ago* apt-pkg/contrib/fileutl.cc:
David Kalnischkies [Wed, 16 May 2012 13:55:32 +0000 (15:55 +0200)] 
* apt-pkg/contrib/fileutl.cc:
  - ensure that we close compressed fds, wait for forks and such even if
    the FileFd itself is set to not autoclose the given Fd

12 years ago* apt-pkg/algorithms.cc:
Marius Vollmer [Tue, 15 May 2012 19:17:08 +0000 (21:17 +0200)] 
* apt-pkg/algorithms.cc:
  - fix memory leak of Flags in pkgSimulate by a proper destructor

12 years ago* methods/http.cc:
David Kalnischkies [Mon, 14 May 2012 22:12:21 +0000 (00:12 +0200)] 
* methods/http.cc:
  - after many years of pointless discussions disable http/1.1 pipelining
    by default as many webservers and proxies seem to be unable to conform
    to specification must's (rfc2616 section 8.1.2.2) (LP: #996151)

12 years ago* methods/mirror.cc:
Raphael Geissert [Mon, 14 May 2012 16:27:37 +0000 (18:27 +0200)] 
* methods/mirror.cc:
  - generate an equal sign also for the first arch (Closes: #669142)

12 years agoadapt manual testcase to check redirects of dists/, too
David Kalnischkies [Mon, 14 May 2012 16:07:34 +0000 (18:07 +0200)] 
adapt manual testcase to check redirects of dists/, too

12 years ago* apt-pkg/acquire*.cc:
Raphael Geissert [Mon, 14 May 2012 16:07:01 +0000 (18:07 +0200)] 
* apt-pkg/acquire*.cc:
  - handle redirections in the worker with the right method instead of
    in the method the redirection occured in (Closes: #668111)
* methods/http.cc:
  - forbid redirects to change protocol

12 years ago* apt-pkg/acquire-methods.cc:
David Kalnischkies [Mon, 14 May 2012 14:53:43 +0000 (16:53 +0200)] 
* apt-pkg/acquire-methods.cc:
  - factor out into private Dequeue() to fix access to deleted pointer

12 years ago* debian/control:
David Kalnischkies [Mon, 14 May 2012 13:16:26 +0000 (15:16 +0200)] 
* debian/control:
  - move doxygen and debiandoc-sgml to Build-Depends-Indep as docs
    are no longer build in the same target as the manpages

12 years ago - separate manpages from the rest of the doc building
David Kalnischkies [Mon, 14 May 2012 12:39:15 +0000 (14:39 +0200)] 
  - separate manpages from the rest of the doc building
  - make apt and apt-utils packages depend on manpages instead of full doc

12 years ago* debian/rules:
David Kalnischkies [Fri, 11 May 2012 22:43:51 +0000 (00:43 +0200)] 
* debian/rules:
  - apt-utils packages manpages, so it should depend on build-doc

12 years ago* prepare-release:
David Kalnischkies [Fri, 11 May 2012 22:40:36 +0000 (00:40 +0200)] 
* prepare-release:
  - apt-inst version isn't apt versions, so don't override variable

12 years ago* Makefile, buildlib/*.mak:
David Kalnischkies [Fri, 11 May 2012 22:36:44 +0000 (00:36 +0200)] 
* Makefile, buildlib/*.mak:
  - reshuffle dependencies so that parallel building seems to work

12 years ago* apt-pkg/pkgcachegen.cc:
David Kalnischkies [Fri, 11 May 2012 22:11:07 +0000 (00:11 +0200)] 
* apt-pkg/pkgcachegen.cc:
  - make IsDuplicatedDescription static so that it is really private
    as we don't need a symbol for it as it is not in a header

12 years agoreleasing version 0.9.3 0.9.3
Michael Vogt [Fri, 11 May 2012 17:08:14 +0000 (19:08 +0200)] 
releasing version 0.9.3

12 years agomerged from david
Michael Vogt [Fri, 11 May 2012 15:15:52 +0000 (17:15 +0200)] 
merged from david

12 years agomerged from david
Michael Vogt [Fri, 11 May 2012 14:21:05 +0000 (16:21 +0200)] 
merged from david

12 years agoadd a manually runable library action to help in maintaining the symbols files
David Kalnischkies [Fri, 11 May 2012 04:49:19 +0000 (06:49 +0200)] 
add a manually runable library action to help in maintaining the symbols files

12 years ago* apt-inst/deb/debfile.h:
David Kalnischkies [Thu, 10 May 2012 18:41:00 +0000 (20:41 +0200)] 
* apt-inst/deb/debfile.h:
  - readd 'md5.h' to the uncleaned header includes to make qapt build
    against us again unchanged to unblock transition (Closes: #669163)

12 years ago* apt-pkg/algorithms.cc:
David Kalnischkies [Thu, 10 May 2012 18:40:47 +0000 (20:40 +0200)] 
* apt-pkg/algorithms.cc:
  - factor out of ListUpdate a AcquireUpdate to be able to provide your
    own pkgAcquire fetcher to the wrapper

12 years agoadd a small wrapper to call gdb in the framework setting
David Kalnischkies [Thu, 10 May 2012 16:47:51 +0000 (18:47 +0200)] 
add a small wrapper to call gdb in the framework setting

12 years agoensure that d is set before accessing it
David Kalnischkies [Thu, 10 May 2012 01:09:18 +0000 (03:09 +0200)] 
ensure that d is set before accessing it

12 years agofix calling style of FileFd (no functional change)
David Kalnischkies [Wed, 9 May 2012 23:54:32 +0000 (01:54 +0200)] 
fix calling style of FileFd (no functional change)

12 years agoensure that in error conditions the Fail flag is set
David Kalnischkies [Wed, 9 May 2012 23:54:21 +0000 (01:54 +0200)] 
ensure that in error conditions the Fail flag is set

12 years agowe don't need zlib (anymore) in rred so don't include it
David Kalnischkies [Wed, 9 May 2012 22:15:52 +0000 (00:15 +0200)] 
we don't need zlib (anymore) in rred so don't include it

12 years agocollect zombie (de)compressor processes on reopen
David Kalnischkies [Wed, 9 May 2012 22:14:50 +0000 (00:14 +0200)] 
collect zombie (de)compressor processes on reopen

12 years agoensure that we do init d only once and especially not with its own
David Kalnischkies [Wed, 9 May 2012 20:05:18 +0000 (22:05 +0200)] 
ensure that we do init d only once and especially not with its own
content as this causes some "interesting" hickups resulting in segfaults
as it seems (Closes: #554387, #670979)

12 years ago* apt-pkg/aptconfiguration.cc:
David Kalnischkies [Wed, 9 May 2012 19:44:11 +0000 (21:44 +0200)] 
* apt-pkg/aptconfiguration.cc:
  - use NULL instead of "" for no (un)compress parameters

12 years ago* apt-pkg/contrib/fileutl.cc:
David Kalnischkies [Wed, 9 May 2012 17:16:39 +0000 (19:16 +0200)] 
* apt-pkg/contrib/fileutl.cc:
  - check that the fd which are closed are valid

12 years ago* apt-pkg/acquire-worker.cc:
YOSHINO Yoshihito [Mon, 7 May 2012 19:16:25 +0000 (21:16 +0200)] 
* apt-pkg/acquire-worker.cc:
  - revert the use of FileFd::Write in OutFdReady as we don't want error
    reports about EAGAIN here as we retry later. Thanks to YOSHINO Yoshihito
    for the report. (Closes: #671721)

12 years agoensure that apti18n.h is included last as advertised (Closes: #671623)
David Kalnischkies [Sat, 5 May 2012 13:37:31 +0000 (15:37 +0200)] 
ensure that apti18n.h is included last as advertised (Closes: #671623)

12 years agocheck if we work on a valid description in IsDuplicateDescription as
David Kalnischkies [Sat, 5 May 2012 00:06:49 +0000 (02:06 +0200)] 
check if we work on a valid description in IsDuplicateDescription as
we end up working on dangling pointers otherwise which segfaults on
s390x and ppc64 (Closes: #669427)

12 years agoadd a simple test for HashSumValue classes
David Kalnischkies [Wed, 2 May 2012 21:13:26 +0000 (23:13 +0200)] 
add a simple test for HashSumValue classes

12 years ago* apt-pkg/deb/deblistparser.cc:
David Kalnischkies [Wed, 2 May 2012 20:31:49 +0000 (22:31 +0200)] 
* apt-pkg/deb/deblistparser.cc:
  - check length and containing chars for a given description md5sum

12 years ago* apt-pkg/pkgcachegen.cc:
David Kalnischkies [Wed, 2 May 2012 20:00:02 +0000 (22:00 +0200)] 
* apt-pkg/pkgcachegen.cc:
  - check if NewDescription allocation has failed and error out accordingly

12 years ago* debian/libapt-inst1.5.symbols:
David Kalnischkies [Wed, 2 May 2012 17:20:56 +0000 (19:20 +0200)] 
* debian/libapt-inst1.5.symbols:
  - use the correct library name the symbols header

12 years agomerged from donkult
Michael Vogt [Wed, 25 Apr 2012 15:02:24 +0000 (17:02 +0200)] 
merged from donkult

12 years agoprovider is only a possible solution if the provides has the right
David Kalnischkies [Mon, 23 Apr 2012 20:03:23 +0000 (22:03 +0200)] 
provider is only a possible solution if the provides has the right
version (or none as we have no versioned provides in debian) and not
if the version of the provider matches

12 years ago/dev/null is a special absolute path as it has no subdirectories
David Kalnischkies [Mon, 23 Apr 2012 17:33:32 +0000 (19:33 +0200)] 
/dev/null is a special absolute path as it has no subdirectories

12 years agonormalize a bit by replacing // and /./ with / in FindFile
David Kalnischkies [Mon, 23 Apr 2012 17:11:11 +0000 (19:11 +0200)] 
normalize a bit by replacing // and /./ with / in FindFile

12 years ago* edsp/edspsystem.cc:
David Kalnischkies [Mon, 23 Apr 2012 16:24:19 +0000 (18:24 +0200)] 
* edsp/edspsystem.cc:
  - check with RealFileExists for scenario file as otherwise a directory
    like one provided with RootDir triggers the usage of EDSP

12 years ago* apt-pkg/depcache.cc:
David Kalnischkies [Mon, 23 Apr 2012 15:46:11 +0000 (17:46 +0200)] 
* apt-pkg/depcache.cc:
  - clearly separate 'positive' and 'negative' dependencies and
    their upgrade-resolution tries in MarkInstall and especially don't
    treat Conflicts differently compared to Breaks here

12 years ago* apt-pkg/cdrom.cc:
David Kalnischkies [Sun, 22 Apr 2012 11:01:37 +0000 (13:01 +0200)] 
* apt-pkg/cdrom.cc:
  - use Dump() to generate the configuration output

12 years ago* cmdline/apt-config.cc:
David Kalnischkies [Sun, 22 Apr 2012 10:29:24 +0000 (12:29 +0200)] 
* cmdline/apt-config.cc:
  - make it possible to limit dump to a subtree
  - implement --empty and --format option for dump

12 years ago* apt-pkg/acquire-worker.cc:
David Kalnischkies [Sun, 22 Apr 2012 10:28:54 +0000 (12:28 +0200)] 
* apt-pkg/acquire-worker.cc:
  - use Dump() to generate the configuration message for sending

12 years ago* apt-pkg/contrib/configuration.cc:
David Kalnischkies [Sun, 22 Apr 2012 10:28:10 +0000 (12:28 +0200)] 
* apt-pkg/contrib/configuration.cc:
  - add a more versatile Dump() method

12 years ago* apt-pkg/contrib/strutl.cc:
David Kalnischkies [Sat, 21 Apr 2012 16:26:49 +0000 (18:26 +0200)] 
* apt-pkg/contrib/strutl.cc:
  - remove the message size limit from ioprintf and strprintf

12 years agoreleasing version 0.9.2 0.9.2
Michael Vogt [Fri, 20 Apr 2012 12:30:39 +0000 (14:30 +0200)] 
releasing version 0.9.2

12 years agomerged from bzr+ssh://bazaar.launchpad.net/~donkult/apt/sid/
Michael Vogt [Fri, 20 Apr 2012 09:11:21 +0000 (11:11 +0200)] 
merged from bzr+ssh://bazaar.launchpad.net/~donkult/apt/sid/

12 years agofix a bug uncovered by the previous commit which checks if a Compressor
David Kalnischkies [Fri, 20 Apr 2012 09:05:35 +0000 (11:05 +0200)] 
fix a bug uncovered by the previous commit which checks if a Compressor
preference given by the Order setting is really available before adding
it as possible CompressionType.

12 years agomerged from lp:~donkult/apt/sid
Michael Vogt [Fri, 20 Apr 2012 08:37:04 +0000 (10:37 +0200)] 
merged from lp:~donkult/apt/sid

12 years ago* apt-pkg/cacheset.cc:
David Kalnischkies [Fri, 20 Apr 2012 08:13:17 +0000 (10:13 +0200)] 
* apt-pkg/cacheset.cc:
  - actually return to the fallback modifier if we have detected we
    should for packagenames which look like modifiers (Closes: #669591)

12 years ago* apt-pkg/contrib/sha2_internal.cc:
David Kalnischkies [Fri, 20 Apr 2012 07:53:24 +0000 (09:53 +0200)] 
* apt-pkg/contrib/sha2_internal.cc:
  - do not use the input data directly but memcpy it instead as
    it could be unaligned as in the http-transport which causes
    a sigbus error on sparc (Closes: #669061)

12 years ago* apt-pkg/aptconfiguration.cc:
David Kalnischkies [Fri, 20 Apr 2012 07:52:17 +0000 (09:52 +0200)] 
* apt-pkg/aptconfiguration.cc:
  - if the compressor is not installed, but we link against it's
    library accept it as a CompressionType (Closes: #669328)

12 years agomerge from the lp:~mvo/apt/mvo branch
Michael Vogt [Fri, 20 Apr 2012 07:18:26 +0000 (09:18 +0200)] 
merge from the lp:~mvo/apt/mvo branch

12 years agocherry pick r1975 from lp:~ubuntu-core-dev/apt/ubuntu
Michael Vogt [Fri, 20 Apr 2012 07:12:56 +0000 (09:12 +0200)] 
cherry pick r1975 from lp:~ubuntu-core-dev/apt/ubuntu