]> git.saurik.com Git - apt.git/log
apt.git
13 years agoremove empty line dpkg-gensymbols complains about
David Kalnischkies [Thu, 30 Jun 2011 12:24:59 +0000 (14:24 +0200)] 
remove empty line dpkg-gensymbols complains about

13 years ago* apt-pkg/pkgcachegen.cc:
David Kalnischkies [Thu, 30 Jun 2011 12:05:03 +0000 (14:05 +0200)] 
* apt-pkg/pkgcachegen.cc:
  - fallback to memory if file is not writeable even if access()
    told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)

13 years agomerge with debian-sid 0.8.15.1
David Kalnischkies [Thu, 30 Jun 2011 11:59:36 +0000 (13:59 +0200)] 
merge with debian-sid 0.8.15.1

13 years agomerged from debian-sid
Michael Vogt [Thu, 30 Jun 2011 08:21:55 +0000 (09:21 +0100)] 
merged from debian-sid

13 years agoreleasing version 0.8.15.1 0.8.15.1
Michael Vogt [Thu, 30 Jun 2011 08:14:38 +0000 (10:14 +0200)] 
releasing version 0.8.15.1

13 years ago* doc/makefile:
Michael Vogt [Thu, 30 Jun 2011 07:33:19 +0000 (08:33 +0100)] 
* doc/makefile:
  - create doxygen directory to avoid depending on magic (Closes: #628799)
* cmdline/apt-key:
  - explicitly state that net-update is not supported if no url is set
  - require to be root for add, rm, update and net-update
  - clarify update vs. net-update in different distros (Closes: #632043)
* debian/apt.symbols:
  - forgot 'mips' in the list for all architecture dependent symbols
  - comment out gcc-4.5 specific symbols as gcc-4.6 is now default
  - the symbol for PrintStatus() is architecture dependent
* apt-pkg/policy.cc:
  - do not segfault in pinning if a package with this name doesn't exist.
    Thanks to Ferdinand Thommes for the report!
  - Defaults is a vector of Pin not of PkgPin
  - ensure that only the first specific stanza for a package is used
  - save all stanzas which had no effect in Unmatched
  - allow package:architecure in Package:

13 years agoallow package:architecure in Package:
David Kalnischkies [Wed, 29 Jun 2011 22:03:26 +0000 (00:03 +0200)] 
allow package:architecure in Package:

13 years ago - ensure that only the first specific stanza for a package is used
David Kalnischkies [Wed, 29 Jun 2011 21:26:38 +0000 (23:26 +0200)] 
  - ensure that only the first specific stanza for a package is used
  - save all stanzas which had no effect in Unmatched

13 years agoDefaults is a vector of Pin not of PkgPin
David Kalnischkies [Wed, 29 Jun 2011 21:16:00 +0000 (23:16 +0200)] 
Defaults is a vector of Pin not of PkgPin

13 years ago* apt-pkg/policy.cc:
David Kalnischkies [Wed, 29 Jun 2011 20:38:59 +0000 (22:38 +0200)] 
* apt-pkg/policy.cc:
  - do not segfault in pinning if a package with this name doesn't exist.
    Thanks to Ferdinand Thommes for the report!

13 years agoMake private sha2 functions static
Matt Emmerton [Wed, 29 Jun 2011 18:22:02 +0000 (20:22 +0200)] 
Make private sha2 functions static
(freebsd which can be considered the "official" upstream has applied it)

13 years agofix compiler warning by reordering init-list
David Kalnischkies [Wed, 29 Jun 2011 17:39:21 +0000 (19:39 +0200)] 
fix compiler warning by reordering init-list
apt-pkg/acquire.h: In constructor ‘pkgAcquire::pkgAcquire()’:
apt-pkg/acquire.h:175:9: warning: ‘pkgAcquire::Running’ will be initialized after [-Wreorder]
apt-pkg/acquire.h:96:8: warning:   ‘int pkgAcquire::LockFD’ [-Wreorder]

13 years ago* apt-pkg/pkgcache.h:
David Kalnischkies [Wed, 29 Jun 2011 17:38:52 +0000 (19:38 +0200)] 
* apt-pkg/pkgcache.h:
  - readd All{Foreign,Allowed} as suggested by Julian to
    remain strictly API compatible

13 years agomerge with debian-experimental 0.8.16~exp2 release
David Kalnischkies [Wed, 29 Jun 2011 17:21:34 +0000 (19:21 +0200)] 
merge with debian-experimental 0.8.16~exp2 release

13 years agothe symbol for PrintStatus() is architecture dependent
David Kalnischkies [Wed, 29 Jun 2011 16:46:20 +0000 (18:46 +0200)] 
the symbol for PrintStatus() is architecture dependent

13 years agocomment out gcc-4.5 specific symbols as gcc-4.6 is now default
David Kalnischkies [Wed, 29 Jun 2011 16:46:01 +0000 (18:46 +0200)] 
comment out gcc-4.5 specific symbols as gcc-4.6 is now default

13 years ago* debian/apt.symbols:
David Kalnischkies [Wed, 29 Jun 2011 16:15:56 +0000 (18:15 +0200)] 
* debian/apt.symbols:
  - forgot 'mips' in the list for all architecture dependent symbols

13 years agoclarify update vs. net-update in different distros (Closes: #632043)
David Kalnischkies [Wed, 29 Jun 2011 16:15:44 +0000 (18:15 +0200)] 
clarify update vs. net-update in different distros (Closes: #632043)

13 years agorequire to be root for add, rm, update and net-update
David Kalnischkies [Wed, 29 Jun 2011 15:24:47 +0000 (17:24 +0200)] 
require to be root for add, rm, update and net-update

13 years ago* cmdline/apt-key:
David Kalnischkies [Wed, 29 Jun 2011 15:15:56 +0000 (17:15 +0200)] 
* cmdline/apt-key:
  - explicitly state that net-update is not supported if no url is set

13 years ago* doc/makefile:
David Kalnischkies [Wed, 29 Jun 2011 14:38:49 +0000 (16:38 +0200)] 
* doc/makefile:
  - create doxygen directory to avoid depending on magic (Closes: #628799)

13 years agomerge with debian-sid release 0.8.15
David Kalnischkies [Wed, 29 Jun 2011 14:29:54 +0000 (16:29 +0200)] 
merge with debian-sid release 0.8.15

13 years agoreleasing version 0.8.16~exp2
Michael Vogt [Wed, 29 Jun 2011 13:20:55 +0000 (15:20 +0200)] 
releasing version 0.8.16~exp2

13 years agodebian/*.symbols: updated for new soname
Michael Vogt [Wed, 29 Jun 2011 13:16:36 +0000 (15:16 +0200)] 
debian/*.symbols: updated for new soname

13 years agoremove no longer needed replaces for libapt-pkg4.11 and libapt-inst1.3
Michael Vogt [Wed, 29 Jun 2011 12:00:03 +0000 (13:00 +0100)] 
remove no longer needed replaces for libapt-pkg4.11 and libapt-inst1.3

13 years agomerge lp:~mvo/apt/abi-break
Michael Vogt [Wed, 29 Jun 2011 11:45:30 +0000 (12:45 +0100)] 
merge lp:~mvo/apt/abi-break

13 years agoreleasing version 0.8.16~exp1
Michael Vogt [Wed, 29 Jun 2011 11:00:06 +0000 (13:00 +0200)] 
releasing version 0.8.16~exp1

13 years agomerged from debian-sid
Michael Vogt [Wed, 29 Jun 2011 10:15:35 +0000 (11:15 +0100)] 
merged from debian-sid

13 years agomerged with the unstable upload
Michael Vogt [Tue, 28 Jun 2011 16:55:26 +0000 (17:55 +0100)] 
merged with the unstable upload

13 years agomerged from debian-sid
Michael Vogt [Tue, 28 Jun 2011 16:53:16 +0000 (17:53 +0100)] 
merged from debian-sid

13 years agoreleasing version 0.8.15 0.8.15
Michael Vogt [Tue, 28 Jun 2011 16:49:01 +0000 (18:49 +0200)] 
releasing version 0.8.15

13 years agovarious typo and syntax corrections in doc/*.xml
Michael Vogt [Tue, 28 Jun 2011 16:00:07 +0000 (17:00 +0100)] 
various typo and syntax corrections in doc/*.xml

13 years agoupdate symbol file (thanks to david)
Michael Vogt [Tue, 28 Jun 2011 15:27:48 +0000 (16:27 +0100)] 
update symbol file (thanks to david)

13 years agomerged from lp:~mvo/apt/mvo
Michael Vogt [Tue, 28 Jun 2011 14:51:33 +0000 (15:51 +0100)] 
merged from lp:~mvo/apt/mvo

13 years agomerged from donkult
Michael Vogt [Tue, 28 Jun 2011 14:49:45 +0000 (15:49 +0100)] 
merged from donkult

13 years agochange to 0.8.14.2
Michael Vogt [Tue, 28 Jun 2011 14:46:28 +0000 (15:46 +0100)] 
change to 0.8.14.2

13 years agocherry pick from donkult
Michael Vogt [Tue, 28 Jun 2011 14:45:59 +0000 (15:45 +0100)] 
cherry pick from donkult

13 years agoadd more to the symbol file
Michael Vogt [Tue, 28 Jun 2011 14:44:02 +0000 (15:44 +0100)] 
add more to the symbol file

13 years agomerged from debian-sid
Michael Vogt [Tue, 28 Jun 2011 14:31:37 +0000 (15:31 +0100)] 
merged from debian-sid

13 years agocherry pick fix from sid
Michael Vogt [Tue, 28 Jun 2011 14:30:51 +0000 (15:30 +0100)] 
cherry pick fix from sid

13 years agomerged symbols file fix from David, many thanks
Michael Vogt [Tue, 28 Jun 2011 10:32:38 +0000 (11:32 +0100)] 
merged symbols file fix from David, many thanks

13 years agomerge from the experimental branch and prepare new upload
Michael Vogt [Tue, 28 Jun 2011 09:52:13 +0000 (10:52 +0100)] 
merge from the experimental branch and prepare new upload

13 years agodebian/control: update breaks for the final upload
Michael Vogt [Tue, 28 Jun 2011 09:31:00 +0000 (10:31 +0100)] 
debian/control: update breaks for the final upload

13 years agomerge updated description from David, many thanks
Michael Vogt [Tue, 28 Jun 2011 09:26:46 +0000 (10:26 +0100)] 
merge updated description from David, many thanks

13 years ago* apt-pkg/deb/dpkgpm.cc:
Michael Vogt [Mon, 27 Jun 2011 08:46:41 +0000 (10:46 +0200)] 
* apt-pkg/deb/dpkgpm.cc:
  - set permissions of term.log to root.adm and 644 (LP: #404724)

13 years ago* debian/control:
Michael Vogt [Wed, 22 Jun 2011 08:54:28 +0000 (10:54 +0200)] 
* debian/control:
  - modernize package description (closes: #624618)

13 years agoCatalan translation update (Jordi Mallach). Closes: #630657
bubulle@debian.org [Sat, 18 Jun 2011 11:56:21 +0000 (13:56 +0200)] 
Catalan translation update (Jordi Mallach). Closes: #630657

13 years agouse depends for the ${shlibs:Depends} to make the breaks work
Michael Vogt [Fri, 17 Jun 2011 20:27:53 +0000 (22:27 +0200)] 
use depends for the ${shlibs:Depends} to make the breaks work

13 years ago* debian/control:
Michael Vogt [Fri, 17 Jun 2011 19:49:52 +0000 (21:49 +0200)] 
* debian/control:
  - add Breaks: 0.8.15~exp3) for libapt-pkg4.10 and
   libapt-inst1.2 (thanks to Jonathan Nieder, closes: #630214)

13 years ago* debian/control:
Michael Vogt [Wed, 15 Jun 2011 15:21:41 +0000 (17:21 +0200)] 
* debian/control:
  - fix incorrect Replaces (closes: #630204) for libapt-inst1.2

13 years agoreleasing version 0.8.15~exp1
Michael Vogt [Fri, 10 Jun 2011 13:45:04 +0000 (15:45 +0200)] 
releasing version 0.8.15~exp1

13 years agomerged lp:~mvo/apt/add-library-pkgs
Michael Vogt [Fri, 10 Jun 2011 13:29:17 +0000 (15:29 +0200)] 
merged lp:~mvo/apt/add-library-pkgs

13 years agodebian/rules: use substvars properly
Michael Vogt [Fri, 10 Jun 2011 13:28:39 +0000 (15:28 +0200)] 
debian/rules: use substvars properly

13 years agogenerate debiandencies for libapt-pkg-dev automatically via deb-substvars
Michael Vogt [Fri, 10 Jun 2011 12:48:57 +0000 (14:48 +0200)] 
generate debiandencies for libapt-pkg-dev automatically via deb-substvars

13 years agoinclude mo files in the right packages
Michael Vogt [Fri, 10 Jun 2011 12:43:06 +0000 (14:43 +0200)] 
include mo files in the right packages

13 years agomerged lp:~mvo/apt/add-library-pkgs
Michael Vogt [Fri, 10 Jun 2011 11:54:20 +0000 (13:54 +0200)] 
merged lp:~mvo/apt/add-library-pkgs

13 years agoGerman documentation translation update (Chris Leick). Closes: #629949
bubulle@debian.org [Thu, 9 Jun 2011 20:48:35 +0000 (22:48 +0200)] 
German documentation translation update (Chris Leick). Closes: #629949

13 years agosimplify symbol files a wee bit
Michael Vogt [Thu, 9 Jun 2011 13:02:33 +0000 (15:02 +0200)] 
simplify symbol files a wee bit

13 years agodo not hardcode the libnames
Michael Vogt [Thu, 9 Jun 2011 12:46:31 +0000 (14:46 +0200)] 
do not hardcode the libnames

13 years agoupdate changelog for the previous two commits
Michael Vogt [Thu, 9 Jun 2011 12:02:03 +0000 (14:02 +0200)] 
update changelog for the previous two commits

13 years agoapt-pkg/deb/debindexfile.cc: kill off another TranslationsAvailable() usage that...
Michael Vogt [Thu, 9 Jun 2011 11:30:08 +0000 (13:30 +0200)] 
apt-pkg/deb/debindexfile.cc: kill off another TranslationsAvailable() usage that is not needed

13 years agoapt-pkg/deb/debindexfile.cc: remove tests for TranslationsAvailable() as this will...
Michael Vogt [Thu, 9 Jun 2011 11:24:36 +0000 (13:24 +0200)] 
apt-pkg/deb/debindexfile.cc: remove tests for TranslationsAvailable() as this will break adding translations to the cache if the current environment does not include the language (e.g. LANG=C but german translations). testing for existance of the file is the better approach

13 years ago* apt-pkg/deb/deblistparser.cc:
Michael Vogt [Thu, 9 Jun 2011 09:51:45 +0000 (11:51 +0200)] 
* apt-pkg/deb/deblistparser.cc:
  - include all known languages when building the apt cache
    (LP: #794907)

13 years agofix lintian issues
Michael Vogt [Wed, 8 Jun 2011 16:18:06 +0000 (18:18 +0200)] 
fix lintian issues

13 years agoremove -l from dh_shlibdeps, that is no longer needed with recent shlibdeps
Michael Vogt [Wed, 8 Jun 2011 15:59:07 +0000 (17:59 +0200)] 
remove -l from dh_shlibdeps, that is no longer needed with recent shlibdeps

13 years agodo not include libapt-pkg* in apt itself, add missing dh_makeshlibs calls
Michael Vogt [Wed, 8 Jun 2011 15:38:55 +0000 (17:38 +0200)] 
do not include libapt-pkg* in apt itself, add missing dh_makeshlibs calls

13 years agoinitial librarification push
Michael Vogt [Wed, 8 Jun 2011 15:12:32 +0000 (17:12 +0200)] 
initial librarification push

13 years agoadd some more dpointer placeholders
Michael Vogt [Wed, 8 Jun 2011 10:27:57 +0000 (12:27 +0200)] 
add some more dpointer placeholders

13 years ago* [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
Michael Vogt [Wed, 8 Jun 2011 10:17:49 +0000 (12:17 +0200)] 
* [ABI-Break] Implement EDSP in libapt-pkg so that all front-ends which
* [ABI-Break] merge lp:~mvo/apt/sha512-template to add support for sha512
* [ABI-Break] merge lp:~mvo/apt/dpointer to support easier extending
  without breaking the ABI

13 years agomerge lp:~mvo/apt/sha512-template to add support for sha512
Michael Vogt [Wed, 8 Jun 2011 10:03:34 +0000 (12:03 +0200)] 
merge lp:~mvo/apt/sha512-template to add support for sha512

13 years agoappend the dist (e.g. sid, wheezy) as a query string when
Michael Vogt [Tue, 7 Jun 2011 11:21:47 +0000 (13:21 +0200)] 
append the dist (e.g. sid, wheezy) as a query string when
asking for a suitable mirror

13 years ago* methods/mirror.cc:
Michael Vogt [Tue, 7 Jun 2011 06:48:09 +0000 (08:48 +0200)] 
* methods/mirror.cc:
  - ignore lines starting with "#" in the mirror file
  - ignore non http urls in the mirrors

13 years agorevert 2114.1.12 as doxygen does this for use now
David Kalnischkies [Mon, 6 Jun 2011 19:33:55 +0000 (21:33 +0200)] 
revert 2114.1.12 as doxygen does this for use now

13 years ago* apt-pkg/indexcopy.cc:
David Kalnischkies [Mon, 6 Jun 2011 19:29:16 +0000 (21:29 +0200)] 
* apt-pkg/indexcopy.cc:
  - Verify that the first line of an InRelease file is a PGP header
    for a signed message. Otherwise a man-in-the-middle can prefix
    a valid InRelease file with his own data! (CVE-2011-1829)

13 years agoadd a very dumb pause method to stop test-execution
David Kalnischkies [Mon, 6 Jun 2011 19:23:00 +0000 (21:23 +0200)] 
add a very dumb pause method to stop test-execution

13 years agomerge from lp:~mvo/apt/mvo
Michael Vogt [Tue, 31 May 2011 08:56:06 +0000 (10:56 +0200)] 
merge from lp:~mvo/apt/mvo

13 years agoapt-pkg/acquire-item.cc: only test packages file for correctness if its not empty...
Michael Vogt [Tue, 31 May 2011 08:40:53 +0000 (10:40 +0200)] 
apt-pkg/acquire-item.cc: only test packages file for correctness if its not empty (its ok to have empty packages files)

13 years agomerged from the debian branch
Michael Vogt [Tue, 31 May 2011 08:34:56 +0000 (10:34 +0200)] 
merged from the debian branch

13 years agoReject files known to be invalid (LP: #346386) (Closes: #627642)
Julian Andres Klode [Mon, 30 May 2011 12:14:11 +0000 (14:14 +0200)] 
Reject files known to be invalid (LP: #346386) (Closes: #627642)

13 years agoapt-pkg/acquire-item.cc: Reject files known to be invalid (LP: #346386) (Closes:...
Julian Andres Klode [Mon, 30 May 2011 12:04:01 +0000 (14:04 +0200)] 
apt-pkg/acquire-item.cc: Reject files known to be invalid (LP: #346386) (Closes: #195301)

This commit deals with the following cases:

  - First section of index file (Packages,Sources,Translation) without Package field
  - Signed release files without GPG data (NODATA)
  - i18n/Index files without hash sums

Handling unsigned Release files is more complicated, and the example code
using indexRecords is disabled as it can reject correct Release files
without hashes. How we can reliably check unsigned Release files is
another question, and not urgent anyway, as it should have no
dramatic effect (we could check that it is a valid RFC-822 section,
but that's a bit too long to write)

13 years ago* cmdline/apt-config.cc:
David Kalnischkies [Sat, 28 May 2011 08:56:46 +0000 (10:56 +0200)] 
* cmdline/apt-config.cc:
  - show Acquire::Languages and APT::Architectures settings
    in 'dump' (Closes: 626739)

13 years ago* apt-pkg/init.cc:
Jörg Sommer [Sat, 28 May 2011 08:54:10 +0000 (10:54 +0200)] 
* apt-pkg/init.cc:
  - don't set deprecated APT::Acquire::Translation, thanks Jörg Sommer!

13 years agouse the correct option name in comment for Acquire::Languages
Jörg Sommer [Sat, 28 May 2011 08:14:43 +0000 (10:14 +0200)] 
use the correct option name in comment for Acquire::Languages

13 years agoItalian translation update (Milo Casagrande). Closes: #627834
bubulle@debian.org [Wed, 25 May 2011 12:45:04 +0000 (14:45 +0200)] 
Italian translation update (Milo Casagrande). Closes: #627834

13 years agodebian/changelog: next version will be 0.8.15
Michael Vogt [Wed, 25 May 2011 12:43:05 +0000 (14:43 +0200)] 
debian/changelog: next version will be 0.8.15

13 years agolog reinstall commands in history.log
David Kalnischkies [Mon, 23 May 2011 16:10:48 +0000 (18:10 +0200)] 
log reinstall commands in history.log

13 years agoremove invalid pkgcache.bin and rebuild it if possible
David Kalnischkies [Thu, 19 May 2011 12:16:43 +0000 (14:16 +0200)] 
remove invalid pkgcache.bin and rebuild it if possible

The next invocation of APT tried to load an outdated big
(and possible io-cold) file just to end up rebuilding it
(possibly only as non-root in memory again and again), so
we remove it here and if we have a srcpkgcache we are
going to rebuild, too.

13 years ago* cmdline/apt-get.cc:
David Kalnischkies [Tue, 17 May 2011 18:20:46 +0000 (20:20 +0200)] 
* cmdline/apt-get.cc:
  - do not discard the error messages from the resolver and instead
    only show the general 'Broken packages' message if nothing else

13 years agoif a Breaks can't be upgraded, remove it. If it or a Conflict
David Kalnischkies [Tue, 17 May 2011 16:23:20 +0000 (18:23 +0200)] 
if a Breaks can't be upgraded, remove it. If it or a Conflict
can't be removed the installation of the breaker fails.

13 years agolet the Mark methods return if their marking was successful
David Kalnischkies [Tue, 17 May 2011 16:22:46 +0000 (18:22 +0200)] 
let the Mark methods return if their marking was successful

13 years ago* apt-pkg/depcache.cc:
David Kalnischkies [Tue, 17 May 2011 16:22:18 +0000 (18:22 +0200)] 
* apt-pkg/depcache.cc:
  - use a boolean instead of an int for Add/Remove in AddStates
    similar to how it works with AddSizes

13 years agoremove deprecated methods which nobody should have used anyway like
David Kalnischkies [Tue, 17 May 2011 16:19:24 +0000 (18:19 +0200)] 
remove deprecated methods which nobody should have used anyway like
pseudo-package related and/or private

13 years ago* apt-pkg/pkgcache.h:
David Kalnischkies [Tue, 17 May 2011 16:14:25 +0000 (18:14 +0200)] 
* apt-pkg/pkgcache.h:
  - clean up mess with the "all" handling in MultiArch to
    fix LP: #733741 cleanly for everyone now

13 years agorename option APT::Solver::Name to simply APT::Solver
David Kalnischkies [Tue, 17 May 2011 15:42:01 +0000 (17:42 +0200)] 
rename option APT::Solver::Name to simply APT::Solver

13 years ago* doc/external-dependency-solver-protocol.txt:
David Kalnischkies [Tue, 17 May 2011 15:37:33 +0000 (17:37 +0200)] 
* doc/external-dependency-solver-protocol.txt:
  - describe EDSP and the configuration interface around it

13 years ago* Implement EDSP in libapt-pkg so that all front-ends which
David Kalnischkies [Tue, 17 May 2011 15:26:59 +0000 (17:26 +0200)] 
* Implement EDSP in libapt-pkg so that all front-ends which
  use the internal resolver can now be used also with external
  ones as the usage is hidden in between the old API
* provide two edsp solvers in apt-utils:
  - 'dump' to quickly output a complete scenario and
  - 'apt' to use the internal as an external resolver

13 years agorename I to J to avoid redefining a variable (clang warning)
David Kalnischkies [Tue, 17 May 2011 13:15:13 +0000 (15:15 +0200)] 
rename I to J to avoid redefining a variable (clang warning)

13 years agoServerState is a struct and not a class (clang mismatch type warning)
David Kalnischkies [Tue, 17 May 2011 13:13:56 +0000 (15:13 +0200)] 
ServerState is a struct and not a class (clang mismatch type warning)

13 years agoremove Size >= 0 check as Itm.Size is an unsigned variable (clang warning)
David Kalnischkies [Tue, 17 May 2011 13:12:04 +0000 (15:12 +0200)] 
remove Size >= 0 check as Itm.Size is an unsigned variable (clang warning)

13 years agomerged from lp:~donkult/apt/sid
Michael Vogt [Mon, 16 May 2011 13:57:52 +0000 (15:57 +0200)] 
merged from lp:~donkult/apt/sid