]> git.saurik.com Git - apt.git/log
apt.git
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* 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 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 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 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 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 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

13 years ago* apt-pkg/packagemanager.cc:
David Kalnischkies [Mon, 16 May 2011 09:41:43 +0000 (11:41 +0200)] 
* apt-pkg/packagemanager.cc:
  - ensure for Multi-Arch:same packages that they are unpacked in
    lock step even in immediate configuration (Closes: #618288)

13 years agoGalician translation update (Miguel Anxo Bouzada). Closes: #626505
bubulle@debian.org [Fri, 13 May 2011 21:00:18 +0000 (23:00 +0200)] 
Galician translation update (Miguel Anxo Bouzada). Closes: #626505

13 years agoMAP_ANON is deprecated in favor of MAP_ANONYMOUS, but telesphoreo needs
David Kalnischkies [Thu, 12 May 2011 23:14:50 +0000 (01:14 +0200)] 
MAP_ANON is deprecated in favor of MAP_ANONYMOUS, but telesphoreo needs
to ships a patch for this so pretend to be nice and make it work (TM)

13 years ago* apt-pkg/contrib/netrc.cc:
David Kalnischkies [Thu, 12 May 2011 23:12:21 +0000 (01:12 +0200)] 
* apt-pkg/contrib/netrc.cc:
  - replace non-posix gnu-extension strdupa with strdup

13 years agorewrite new and previously satisfied important dependency detection in
David Kalnischkies [Thu, 12 May 2011 22:07:22 +0000 (00:07 +0200)] 
rewrite new and previously satisfied important dependency detection in
MarkInstall to be a bit more easy to read and possibily a bit faster -
and add a small testcase for these situations to ensure the same behaviour

13 years agomove the broken dependency detection above the new recommends detection
David Kalnischkies [Thu, 12 May 2011 10:45:37 +0000 (12:45 +0200)] 
move the broken dependency detection above the new recommends detection
as if the recommends can't be installed there is not much sense in checking
if it a new recommends or not

13 years agoconvert a lot of places to use IsNegative instead of checking by hand
David Kalnischkies [Wed, 11 May 2011 14:05:30 +0000 (16:05 +0200)] 
convert a lot of places to use IsNegative instead of checking by hand
for the three different dependencies

13 years agoif critical or-group can't be satisfied, exit directly.
David Kalnischkies [Wed, 11 May 2011 12:09:18 +0000 (14:09 +0200)] 
if critical or-group can't be satisfied, exit directly.

13 years agofix order of CurrentURI and UsedMirror in Status() and Log()
David Kalnischkies [Tue, 10 May 2011 16:51:29 +0000 (18:51 +0200)] 
fix order of CurrentURI and UsedMirror in Status() and Log()

13 years agodequote URL taken from Location in redirects as we will otherwise
David Kalnischkies [Tue, 10 May 2011 13:49:25 +0000 (15:49 +0200)] 
dequote URL taken from Location in redirects as we will otherwise
quote an already quoted string in the request later (Closes: #602412)

13 years agoLocation header in redirects should be absolute URI, but some
David Kalnischkies [Thu, 28 Apr 2011 23:20:44 +0000 (01:20 +0200)] 
Location header in redirects should be absolute URI, but some
servers just send an absolute path so still deal with it properly

13 years ago* debian/control:
Julian Andres Klode [Wed, 27 Apr 2011 12:52:49 +0000 (14:52 +0200)] 
* debian/control:
  - Move ${shlibs:Depends} to Pre-Depends, as we do not want APT
    unpacked if a library is too old and thus break upgrades

13 years agosupport lighttpd as test webserver but still prefer weborf
David Kalnischkies [Wed, 27 Apr 2011 12:38:48 +0000 (14:38 +0200)] 
support lighttpd as test webserver but still prefer weborf

13 years ago* methods/http.cc:
David Kalnischkies [Wed, 27 Apr 2011 08:32:53 +0000 (10:32 +0200)] 
* methods/http.cc:
  - add config option to ignore a closed stdin to be able to easily
    use the method as a simple standalone downloader

13 years ago* apt-pkg/acquire-item.cc:
Ben Finney [Tue, 26 Apr 2011 20:45:31 +0000 (22:45 +0200)] 
* apt-pkg/acquire-item.cc:
  - apply fix for poorly worded 'locate file' error message from
    Ben Finney, thanks! (Closes: #623171)

13 years ago* apt-pkg/acquire-worker.cc:
David Kalnischkies [Tue, 26 Apr 2011 20:37:46 +0000 (22:37 +0200)] 
* apt-pkg/acquire-worker.cc:
  - print filename in the unmatching size warning (Closes: #623137)

13 years ago* test/versions.lst:
David Kalnischkies [Tue, 26 Apr 2011 17:30:21 +0000 (19:30 +0200)] 
* test/versions.lst:
  - disable obscure version number tests with versions dpkg doesn't
    allow any more as they don't start with a number

13 years ago* apt-pkg/deb/debmetaindex.cc:
David Kalnischkies [Tue, 26 Apr 2011 17:15:29 +0000 (19:15 +0200)] 
* apt-pkg/deb/debmetaindex.cc:
  - do not download TranslationIndex if no Translation-* will be
    downloaded later on anyway (Closes: #624218)

13 years ago* doc/po/de.po:
Chris Leick [Tue, 26 Apr 2011 15:43:15 +0000 (17:43 +0200)] 
* doc/po/de.po:
  - undo the translation of the command 'dump' in manpage of apt-config
    as report by Burghard Grossmann on debian-l10n-german, thanks!

13 years agoprovide a 'dpkg --set-selections' wrapper to set/release holds
David Kalnischkies [Tue, 26 Apr 2011 15:29:54 +0000 (17:29 +0200)] 
provide a 'dpkg --set-selections' wrapper to set/release holds

13 years ago* apt-pkg/pkgcache.cc:
David Kalnischkies [Mon, 25 Apr 2011 11:51:53 +0000 (13:51 +0200)] 
* apt-pkg/pkgcache.cc:
  - really ignore :arch in FindPkg() in non-multiarch environment

13 years agoupdate the apt-mark manpage
David Kalnischkies [Thu, 21 Apr 2011 16:58:07 +0000 (18:58 +0200)] 
update the apt-mark manpage

13 years agoadd a close entry as a showmanual is provided by apt-mark now
David Kalnischkies [Thu, 21 Apr 2011 16:56:40 +0000 (18:56 +0200)] 
add a close entry as a showmanual is provided by apt-mark now

13 years ago* cmdline/apt-get.cc:
David Kalnischkies [Thu, 21 Apr 2011 15:00:37 +0000 (17:00 +0200)] 
* cmdline/apt-get.cc:
  - deprecate mostly undocumented 'markauto' in favor of 'apt-mark'
* cmdline/apt-cache.cc:
  - deprecate mostly undocumented 'showauto' in favor of 'apt-mark'

13 years ago* cmdline/apt-mark.cc:
David Kalnischkies [Thu, 21 Apr 2011 14:46:28 +0000 (16:46 +0200)] 
* cmdline/apt-mark.cc:
  - reimplement apt-mark in c++

13 years agoremove not existing packages left over from the testcase
David Kalnischkies [Thu, 21 Apr 2011 14:41:07 +0000 (16:41 +0200)] 
remove not existing packages left over from the testcase

13 years agosimplify the code for wildcard pinning a bit
David Kalnischkies [Thu, 21 Apr 2011 14:38:06 +0000 (16:38 +0200)] 
simplify the code for wildcard pinning a bit

13 years agoMake purge work again for config-files (LP: #244598) (Closes: #150831)
Julian Andres Klode [Thu, 21 Apr 2011 10:18:05 +0000 (12:18 +0200)] 
Make purge work again for config-files (LP: #244598) (Closes: #150831)

13 years agodoc/apt-key.8.xml: Document apt-key net-update (LP: #192810)
Julian Andres Klode [Thu, 21 Apr 2011 09:25:52 +0000 (11:25 +0200)] 
doc/apt-key.8.xml: Document apt-key net-update (LP: #192810)

13 years agodebian/apt.cron.daily: Check power after wait, patch by manuel-soto (LP: #705269)
Julian Andres Klode [Thu, 21 Apr 2011 07:53:37 +0000 (09:53 +0200)] 
debian/apt.cron.daily: Check power after wait, patch by manuel-soto (LP: #705269)

13 years agomerge with debian-sid branch and 0.8.14.1 release
David Kalnischkies [Wed, 20 Apr 2011 14:02:44 +0000 (16:02 +0200)] 
merge with debian-sid branch and 0.8.14.1 release

* apt-pkg/depcache.cc:
  - Really release action groups only once (Closes: #622744)
* apt-pkg/acquire-item.cc:
  - Only try to rename existing Release files (Closes: #622912)

13 years ago* debian/rules:
David Kalnischkies [Tue, 19 Apr 2011 18:58:14 +0000 (20:58 +0200)] 
* debian/rules:
  - remove unused embedded jquery by doxygen from libapt-pkg-doc

13 years ago* debian/apt.lintian-overrides:
David Kalnischkies [Tue, 19 Apr 2011 17:35:59 +0000 (19:35 +0200)] 
* debian/apt.lintian-overrides:
  - update the missing-python-dep override to the lintian 2.5 way

13 years ago* debian/apt{,-utils}.symbols:
David Kalnischkies [Tue, 19 Apr 2011 17:28:34 +0000 (19:28 +0200)] 
* debian/apt{,-utils}.symbols:
  - update both experimental symbol-files to reflect 0.8.14 state

13 years agoapt-pkg/depcache.cc: Really release action groups only once (Closes: #622744)
Julian Andres Klode [Mon, 18 Apr 2011 08:56:37 +0000 (10:56 +0200)] 
apt-pkg/depcache.cc: Really release action groups only once (Closes: #622744)

13 years ago* apt-pkg/deb/dpkgpm.cc:
David Kalnischkies [Sat, 16 Apr 2011 16:55:53 +0000 (18:55 +0200)] 
* apt-pkg/deb/dpkgpm.cc:
  - replace obsolete usleep with nanosleep

13 years agocppcheck: (style) Variable 'State' is assigned a value that is never used
David Kalnischkies [Sat, 16 Apr 2011 16:11:47 +0000 (18:11 +0200)] 
cppcheck: (style) Variable 'State' is assigned a value that is never used

13 years ago* apt-pkg/orderlist.cc:
David Kalnischkies [Sat, 16 Apr 2011 16:07:52 +0000 (18:07 +0200)] 
* apt-pkg/orderlist.cc:
  - let VisitRProvides report if the calls were successful

13 years agoremove the extra unnecessary qualification cppcheck complains about
David Kalnischkies [Sat, 16 Apr 2011 14:56:39 +0000 (16:56 +0200)] 
remove the extra unnecessary qualification cppcheck complains about

13 years ago* apt-pkg/acquire-method.cc:
David Kalnischkies [Sat, 16 Apr 2011 14:50:37 +0000 (16:50 +0200)] 
* apt-pkg/acquire-method.cc:
  - write directly to stdout instead of creating the message in
    memory first before writing to avoid hitting limits

13 years agoRelease 0.8.14.1 0.8.14.1
Julian Andres Klode [Sat, 16 Apr 2011 12:36:18 +0000 (14:36 +0200)] 
Release 0.8.14.1

13 years agoapt-pkg/acquire-item.cc: Only try to rename existing Release files (Closes: #622912)
Julian Andres Klode [Sat, 16 Apr 2011 09:02:47 +0000 (11:02 +0200)] 
apt-pkg/acquire-item.cc: Only try to rename existing Release files (Closes: #622912)

13 years agofix a bunch of cppcheck warnings/errors based on a patch by
David Kalnischkies [Fri, 15 Apr 2011 23:10:09 +0000 (01:10 +0200)] 
fix a bunch of cppcheck warnings/errors based on a patch by
Niels Thykier, thanks! (Closes: #622805)

13 years ago* apt-pkg/depcache.cc:
David Kalnischkies [Fri, 15 Apr 2011 22:06:34 +0000 (00:06 +0200)] 
* apt-pkg/depcache.cc:
  - really include 'rc' packages in the delete count by fixing a
    typo which exists since 1999 in the sourceā€¦ (LP: #761175)

13 years agoadd sbin directories to PATH to avoid dpkg warnings
David Kalnischkies [Fri, 15 Apr 2011 20:05:34 +0000 (22:05 +0200)] 
add sbin directories to PATH to avoid dpkg warnings

13 years agobe able to set priorities for created test packages
David Kalnischkies [Fri, 15 Apr 2011 20:04:48 +0000 (22:04 +0200)] 
be able to set priorities for created test packages

13 years agoRelease 0.8.14 0.8.14
Julian Andres Klode [Fri, 15 Apr 2011 12:28:28 +0000 (14:28 +0200)] 
Release 0.8.14

13 years ago* debian/control:
Julian Andres Klode [Fri, 15 Apr 2011 12:28:11 +0000 (14:28 +0200)] 
* debian/control:
  - Set Standards-Version to 3.9.2

13 years agoMerge from DonKult
Julian Andres Klode [Fri, 15 Apr 2011 12:25:43 +0000 (14:25 +0200)] 
Merge from DonKult

13 years agoLast commit Closes: #121132, LP: #399474
Julian Andres Klode [Fri, 15 Apr 2011 10:59:55 +0000 (12:59 +0200)] 
Last commit Closes: #121132, LP: #399474

13 years agoClose LP: #399474
Julian Andres Klode [Fri, 15 Apr 2011 10:57:45 +0000 (12:57 +0200)] 
Close LP: #399474

13 years ago* apt-pkg/policy.cc:
Julian Andres Klode [Fri, 15 Apr 2011 10:52:45 +0000 (12:52 +0200)] 
* apt-pkg/policy.cc:
  - Allow pinning by glob() expressions, and regular expressions
    surrounded by slashes (the "/" character).

13 years ago* apt-pkg/deb/deblistparser.cc:
Julian Andres Klode [Thu, 14 Apr 2011 10:28:00 +0000 (12:28 +0200)] 
* apt-pkg/deb/deblistparser.cc:
  - Handle no space before "[" in build-dependencies (LP: #72344)

13 years ago* cmdline/apt-get.cc:
Julian Andres Klode [Wed, 13 Apr 2011 09:33:41 +0000 (11:33 +0200)] 
* cmdline/apt-get.cc:
  - Do not install recommends for build-dep (Closes: #454479) (LP: #245273)

13 years agomerged from the mvo branch
Michael Vogt [Fri, 8 Apr 2011 12:36:08 +0000 (14:36 +0200)] 
merged from the mvo branch

13 years ago* apt-pkg/acquire-item.cc:
Julian Andres Klode [Fri, 8 Apr 2011 11:57:04 +0000 (13:57 +0200)] 
* apt-pkg/acquire-item.cc:
  - Use Release files even if they cannot be verified (LP: #704595)

13 years ago* apt-pkg/indexcopy.cc:
Julian Andres Klode [Thu, 7 Apr 2011 09:52:23 +0000 (11:52 +0200)] 
* apt-pkg/indexcopy.cc:
  - Use RealFileExists() instead of FileExists(), allows amongst other
    things a directory named Sources to exist on a CD-ROM (LP: #750694).

13 years ago* debian/apt.cron.daily:
Michael Vogt [Thu, 7 Apr 2011 09:03:40 +0000 (11:03 +0200)] 
* debian/apt.cron.daily:
  - run unattended-upgrades even if there was a error during
    the apt-get update (LP: #676295)

13 years ago* apt-pkg/pkgcache.cc:
David Kalnischkies [Wed, 6 Apr 2011 14:47:58 +0000 (16:47 +0200)] 
* apt-pkg/pkgcache.cc:
  - use the native Architecture stored in the cache header instead of
    loading it from configuration as suggested by Julian Andres Klode

13 years agodocument the pkg:any specialcasing in FindPkg as well to make it clear
David Kalnischkies [Wed, 6 Apr 2011 11:27:52 +0000 (13:27 +0200)] 
document the pkg:any specialcasing in FindPkg as well to make it clear
that it is a needed "hack" to support multi-arch in the least breaking way

13 years ago* apt-pkg/aptconfiguration.cc:
Michael Vogt [Tue, 5 Apr 2011 10:06:10 +0000 (12:06 +0200)] 
* apt-pkg/aptconfiguration.cc:
  - fix comparing for a empty string

13 years agomerged from debian-sid
Michael Vogt [Tue, 5 Apr 2011 09:58:09 +0000 (11:58 +0200)] 
merged from debian-sid

13 years agoreleasing version 0.8.13.2 0.8.13.2
Michael Vogt [Tue, 5 Apr 2011 08:17:07 +0000 (10:17 +0200)] 
releasing version 0.8.13.2

13 years agomerged from lp:~donkult/apt/sid
Michael Vogt [Mon, 4 Apr 2011 14:49:21 +0000 (16:49 +0200)] 
merged from lp:~donkult/apt/sid

13 years agomerged from debian-sid
Michael Vogt [Mon, 4 Apr 2011 12:11:40 +0000 (14:11 +0200)] 
merged from debian-sid