update notifier

Merge lp://staging/~lqb/update-notifier/kdeproxy+kwallet-support into lp://staging/update-notifier/ubuntu

  1. kdeproxy+kwallet-support
  2. Merge into ubuntu
Proposed by Lorenz
Status: Work in progress
Proposed branch: lp://staging/~lqb/update-notifier/kdeproxy+kwallet-support
Merge into: lp://staging/update-notifier/ubuntu
Diff against target: 597 lines (+457/-9)
7 files modified
TODO (+7/-1)
data/kwalletdbuscli.py (+94/-0)
data/org.freedesktop.policykit.pkexec.package-data-downloader.policy (+19/-0)
data/package-data-downloader (+318/-6)
debian/changelog (+11/-1)
debian/control (+5/-1)
debian/update-notifier-common.install (+3/-0)
To merge this branch: bzr merge lp://staging/~lqb/update-notifier/kdeproxy+kwallet-support
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Fixing
Review via email: mp+153420@code.staging.launchpad.net

Description of the change

- Added proxy support configured in kde
- Added kwallet support
- Added simple GUI Password dialog for proxy authentification

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thank you for your work, the current version of the merge request has conflicts (in data/package-data-downloader and debian/control), could you resolve those and resubmit it?

review: Needs Fixing
Reply
lp://staging/~lqb/update-notifier/kdeproxy+kwallet-support updated
706. By Lorenz

  * resolved conflict debian/control
  * resolved conflict data/package-data-downloader

Revision history for this message
Lorenz (lqb) wrote :

> thank you for your work, the current version of the merge request has
> conflicts (in data/package-data-downloader and debian/control), could you
> resolve those and resubmit it?

My try to do that failed. I have to find out what I made wrong. Perhaps you might give me a hint.
Thanks

Reply
Revision history for this message
Sebastien Bacher (seb128) wrote :

Not sure what happened, in case there were need commits in the vcs since you did the change you might want to "bzr merge lp:update-notifier" in your branch, then resolve the conflicts and use "bzr resolve <files_that_conflicted>"

Reply
lp://staging/~lqb/update-notifier/kdeproxy+kwallet-support updated
707. By Lorenz

merged data/package-data-downloader

708. By Lorenz

merge with trunk

Revision history for this message
Lorenz (lqb) wrote :

> Not sure what happened, in case there were need commits in the vcs since you
> did the change you might want to "bzr merge lp:update-notifier" in your
> branch, then resolve the conflicts and use "bzr resolve
> <files_that_conflicted>"

That is not realy what I wanted but it works.
Thanks

Reply
lp://staging/~lqb/update-notifier/kdeproxy+kwallet-support updated
709. By Lorenz

merged with trunk

710. By Lorenz

bufix for password dialog problem

Unmerged revisions

710. By Lorenz

bufix for password dialog problem

709. By Lorenz

merged with trunk

708. By Lorenz

merge with trunk

707. By Lorenz

merged data/package-data-downloader

706. By Lorenz

  * resolved conflict debian/control
  * resolved conflict data/package-data-downloader

705. By Lorenz

  * added policykit rule to allow pkexec to use the GUI
  * Enhanced proxy support for kde with kwallet support
  * added partial autoconfiguration support (if configured in kde)
  * added gui prompt for proxy password
  * added passwordcache

704. By Lorenz

Merged from lp:~lqb/update-notifier/bug1152203

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: