Merge lp://staging/~kelemeng/aptdaemon/bug640972 into lp://staging/aptdaemon/0.3
Proposed by
Sebastian Heinlein
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~kelemeng/aptdaemon/bug640972 |
| Merge into: | lp://staging/aptdaemon/0.3 |
| Diff against target: |
116200 lines (+115042/-0) (has conflicts) 196 files modified
.pc/.version (+1/-0) .pc/05_sources_list_password.patch/aptdaemon/worker.py (+1010/-0) .pc/06_rosetta_po_update.patch/po/am.po (+577/-0) .pc/06_rosetta_po_update.patch/po/ar.po (+558/-0) .pc/06_rosetta_po_update.patch/po/ast.po (+617/-0) .pc/06_rosetta_po_update.patch/po/be.po (+594/-0) .pc/06_rosetta_po_update.patch/po/bg.po (+606/-0) .pc/06_rosetta_po_update.patch/po/bn.po (+558/-0) .pc/06_rosetta_po_update.patch/po/ca.po (+598/-0) .pc/06_rosetta_po_update.patch/po/crh.po (+558/-0) .pc/06_rosetta_po_update.patch/po/cs.po (+583/-0) .pc/06_rosetta_po_update.patch/po/da.po (+592/-0) .pc/06_rosetta_po_update.patch/po/de.po (+634/-0) .pc/06_rosetta_po_update.patch/po/el.po (+597/-0) .pc/06_rosetta_po_update.patch/po/en_AU.po (+613/-0) .pc/06_rosetta_po_update.patch/po/en_CA.po (+611/-0) .pc/06_rosetta_po_update.patch/po/en_GB.po (+613/-0) .pc/06_rosetta_po_update.patch/po/eo.po (+610/-0) .pc/06_rosetta_po_update.patch/po/es.po (+620/-0) .pc/06_rosetta_po_update.patch/po/eu.po (+615/-0) .pc/06_rosetta_po_update.patch/po/fi.po (+617/-0) .pc/06_rosetta_po_update.patch/po/fr.po (+629/-0) .pc/06_rosetta_po_update.patch/po/gl.po (+618/-0) .pc/06_rosetta_po_update.patch/po/he.po (+594/-0) .pc/06_rosetta_po_update.patch/po/hu.po (+609/-0) .pc/06_rosetta_po_update.patch/po/id.po (+608/-0) .pc/06_rosetta_po_update.patch/po/is.po (+562/-0) .pc/06_rosetta_po_update.patch/po/it.po (+625/-0) .pc/06_rosetta_po_update.patch/po/ja.po (+571/-0) .pc/06_rosetta_po_update.patch/po/kk.po (+611/-0) .pc/06_rosetta_po_update.patch/po/ko.po (+566/-0) .pc/06_rosetta_po_update.patch/po/lt.po (+610/-0) .pc/06_rosetta_po_update.patch/po/ms.po (+596/-0) .pc/06_rosetta_po_update.patch/po/nb.po (+609/-0) .pc/06_rosetta_po_update.patch/po/nds.po (+561/-0) .pc/06_rosetta_po_update.patch/po/ne.po (+562/-0) .pc/06_rosetta_po_update.patch/po/nl.po (+622/-0) .pc/06_rosetta_po_update.patch/po/oc.po (+624/-0) .pc/06_rosetta_po_update.patch/po/pl.po (+609/-0) .pc/06_rosetta_po_update.patch/po/pt.po (+618/-0) .pc/06_rosetta_po_update.patch/po/pt_BR.po (+616/-0) .pc/06_rosetta_po_update.patch/po/ro.po (+618/-0) .pc/06_rosetta_po_update.patch/po/ru.po (+610/-0) .pc/06_rosetta_po_update.patch/po/sk.po (+586/-0) .pc/06_rosetta_po_update.patch/po/sl.po (+610/-0) .pc/06_rosetta_po_update.patch/po/sq.po (+619/-0) .pc/06_rosetta_po_update.patch/po/sv.po (+614/-0) .pc/06_rosetta_po_update.patch/po/tr.po (+611/-0) .pc/06_rosetta_po_update.patch/po/uk.po (+612/-0) .pc/06_rosetta_po_update.patch/po/vi.po (+585/-0) .pc/06_rosetta_po_update.patch/po/zh_CN.po (+582/-0) .pc/06_rosetta_po_update.patch/po/zh_TW.po (+583/-0) .pc/applied-patches (+2/-0) AUTHORS (+9/-0) COPYRIGHT (+339/-0) NEWS (+322/-0) README (+7/-0) README.plugins (+50/-0) README.tests (+3/-0) TODO (+26/-0) applet.py (+131/-0) aptd (+30/-0) aptdaemon/__init__.py (+28/-0) aptdaemon/client.py (+1039/-0) aptdaemon/console.py (+614/-0) aptdaemon/core.py (+1526/-0) aptdaemon/debconf.py (+180/-0) aptdaemon/defer.py (+664/-0) aptdaemon/enums.py (+366/-0) aptdaemon/errors.py (+176/-0) aptdaemon/gtkwidgets.py (+1088/-0) aptdaemon/lock.py (+114/-0) aptdaemon/loop.py (+32/-0) aptdaemon/policykit1.py (+147/-0) aptdaemon/progress.py (+539/-0) aptdaemon/test/debconf/aptdaemon.config (+10/-0) aptdaemon/test/debconf/aptdaemon.templates (+5/-0) aptdaemon/test/test_debconf.py (+127/-0) aptdaemon/test/test_defer.py (+160/-0) aptdaemon/test/test_dpkg_journal.py (+53/-0) aptdaemon/test/test_future_status.py (+89/-0) aptdaemon/test/test_trans_chain.py (+60/-0) aptdaemon/utils.py (+51/-0) aptdaemon/worker.py (+1025/-0) aptdcon (+30/-0) data/20dbus (+2/-0) data/icons/clean_svg_icons.sh (+11/-0) data/icons/generate_16x16_icons.sh (+14/-0) data/icons/generate_24x24_icons.sh (+14/-0) data/icons/generate_48x48_icons.sh (+13/-0) data/icons/scalable/status/aptdaemon-add.svg (+350/-0) data/icons/scalable/status/aptdaemon-cleanup.svg (+550/-0) data/icons/scalable/status/aptdaemon-delete.svg (+554/-0) data/icons/scalable/status/aptdaemon-download.svg (+357/-0) data/icons/scalable/status/aptdaemon-resolve.svg (+471/-0) data/icons/scalable/status/aptdaemon-setup.svg (+344/-0) data/icons/scalable/status/aptdaemon-update-cache.svg (+1100/-0) data/icons/scalable/status/aptdaemon-upgrade.svg (+551/-0) data/icons/scalable/status/aptdaemon-wait.svg (+439/-0) data/org.debian.apt.conf (+17/-0) data/org.debian.apt.policy.in (+144/-0) data/org.debian.apt.service (+5/-0) debian/README.Debian (+9/-0) debian/aptdaemon.install (+8/-0) debian/changelog (+477/-0) debian/compat (+1/-0) debian/control (+81/-0) debian/copyright (+34/-0) debian/patches/05_sources_list_password.patch (+48/-0) debian/patches/06_rosetta_po_update.patch (+20993/-0) debian/patches/series (+3/-0) debian/python-aptdaemon-gtk.examples (+1/-0) debian/python-aptdaemon-gtk.install (+2/-0) debian/python-aptdaemon.install (+13/-0) debian/rules (+10/-0) debian/source/format (+1/-0) debian/watch (+2/-0) doc/aptd.1 (+54/-0) doc/aptdcon.1 (+95/-0) doc/examples/chained.py (+47/-0) doc/org.debian.apt.7 (+221/-0) doc/org.debian.apt.transaction.7 (+217/-0) gtk-demo.py (+165/-0) po/POTFILES.in (+7/-0) po/af.po (+599/-0) po/am.po (+709/-0) po/ar.po (+699/-0) po/ast.po (+763/-0) po/be.po (+746/-0) po/bg.po (+750/-0) po/bn.po (+703/-0) po/br.po (+596/-0) po/bs.po (+558/-0) po/ca.po (+755/-0) po/crh.po (+698/-0) po/cs.po (+740/-0) po/da.po (+749/-0) po/de.po (+768/-0) po/dv.po (+560/-0) po/el.po (+754/-0) po/en_AU.po (+748/-0) po/en_CA.po (+746/-0) po/en_GB.po (+760/-0) po/eo.po (+745/-0) po/es.po (+766/-0) po/et.po (+582/-0) po/eu.po (+750/-0) po/fa.po (+558/-0) po/fi.po (+758/-0) po/fr.po (+766/-0) po/gl.po (+765/-0) po/he.po (+735/-0) po/hi.po (+588/-0) po/hr.po (+558/-0) po/hu.po (+748/-0) po/id.po (+742/-0) po/is.po (+702/-0) po/it.po (+758/-0) po/ja.po (+721/-0) po/kk.po (+746/-0) po/ko.po (+723/-0) po/ku.po (+563/-0) po/lt.po (+746/-0) po/lv.po (+588/-0) po/ml.po (+568/-0) po/ms.po (+753/-0) po/nb.po (+752/-0) po/nds.po (+701/-0) po/ne.po (+707/-0) po/nl.po (+767/-0) po/nn.po (+558/-0) po/oc.po (+757/-0) po/pl.po (+745/-0) po/pt.po (+753/-0) po/pt_BR.po (+762/-0) po/ro.po (+767/-0) po/ru.po (+758/-0) po/si.po (+558/-0) po/sk.po (+743/-0) po/sl.po (+760/-0) po/sq.po (+754/-0) po/sr.po (+587/-0) po/sv.po (+760/-0) po/ta.po (+558/-0) po/th.po (+562/-0) po/tr.po (+756/-0) po/ug.po (+588/-0) po/uk.po (+748/-0) po/vi.po (+742/-0) po/zh_CN.po (+718/-0) po/zh_HK.po (+561/-0) po/zh_TW.po (+719/-0) pylintrc (+8/-0) release.sh (+21/-0) setup.cfg (+17/-0) setup.py (+26/-0) Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file COPYRIGHT. Moved existing file to COPYRIGHT.moved. Conflict adding file NEWS. Moved existing file to NEWS.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file README.plugins. Moved existing file to README.plugins.moved. Conflict adding file README.tests. Moved existing file to README.tests.moved. Conflict adding file TODO. Moved existing file to TODO.moved. Conflict adding file applet.py. Moved existing file to applet.py.moved. Conflict adding file aptd. Moved existing file to aptd.moved. Conflict adding file aptdaemon. Moved existing file to aptdaemon.moved. Conflict adding file aptdcon. Moved existing file to aptdcon.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file doc. Moved existing file to doc.moved. Conflict adding file gtk-demo.py. Moved existing file to gtk-demo.py.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file pylintrc. Moved existing file to pylintrc.moved. Conflict adding file release.sh. Moved existing file to release.sh.moved. Conflict adding file setup.cfg. Moved existing file to setup.cfg.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. |
| To merge this branch: | bzr merge lp://staging/~kelemeng/aptdaemon/bug640972 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastian Heinlein | Disapprove | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 45. By Gabor Kelemen
-
Correct misplaced parentheses, so that l10n of strings will work. Fixes LP: 640972
- 44. By Michael Vogt
-
* merge fixes from bzr:
- fix for aptdaemon.client. get_transaction ()
- autodetect if "defer" is needed - 43. By Michael Vogt
-
* new bzr snapshot:
- makes 03_auth_me_less. patch no longer needed (applied upstream)
- improvements to the policykit privs - 42. By Michael Vogt
-
* new bzr snapshot:
- makes 07_i18n_fixes.patch no longer needed (applied upstream)
- supports partial cache update (important fix for the buy-something
use case)
- fix missing (untranslated) role strings
* debian/control:
- depend on the right python-apt version - 41. By Michael Vogt
-
* debian/
patches/ 07_i18n_ fixes.patch:
- use dgettext to not clobber the clients gettext.textdomain
on import (LP: #631675)
* debian/patches/ 05_sources_ list_password. patch:
- when adding a sources.list entry with a password protect
the file via mode 0640 and root.admin ownership - 40. By Michael Vogt
-
new bzr snapshot that fixes missing i18n in the policykit
descriptions (LP: #625409) - 39. By Michael Vogt
-
* new bzr snapshot that fixes some locking issues (LP: #616470)
* debian/python- aptdaemon. install:
- add lock.py to the installed files - 38. By Michael Vogt
-
new bzr snapshot that fixes authentication timeout problem
(LP: #623424), big thanks to Sebastian Heinlein - 37. By Michael Vogt
-
* .bzr-builddeb/
default. conf:
- switch to lp:~aptdaemon-developers/aptdaemon/0.3
* new bzr snapshot from the 0.3 stable branch:
- simplify/improved policykit priviligies - 36. By Michael Vogt
-
* debian/
patches/ 06_rosetta_ po_update. patch:
- updated translations from rosetta for the policy.in
file (LP: #44560)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks!