-
Committer:
Bazaar Package Importer
-
Author(s):
Matthias Klose
-
Date:
2007-12-05 18:25:19 UTC
-
mfrom:
(1.1.3 lenny)
-
Revision ID:
james.westby@ubuntu.com-20071205182519-vs4sr313z1o4wpx8
Tags: 2.0.0-5ubuntu1
* Merge with Debian; remaining changes:
- debian/patches/14_set_http_proxy_env.patch:
+ set http_proxy environment from gconf
- debian/patches/07_desktop_in_ship.patch:
+ don't display root-terminal menu entry
- debian/patches/01_always_ask.patch:
+ added new '--always-ask-pass' commandline switch
- debian/patches/10_quotes_fix.patch:
+ fix passing of strings with "'" between gksu/libgksu (LP#51419)