-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Vogt
-
Date:
2009-05-05 10:44:53 UTC
-
mfrom:
(1.1.7 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090505104453-23h71juuokm3dqjo
Tags: 2.0.2-2ubuntu1
* Merge from debian unstable, remaining changes:
- control.in: remove build-dependency on sng (universe)
- control.in: and add sharutil b-d
- do not do the sng->png at build time but
instead include a static uuencoded copy
- debian/patches/01_always_ask.patch:
+ added new '--always-ask-pass' commandline switch
- debian/patches/07_desktop_in_ship.patch:
+ don't display root-terminal menu entry
- debian/patches/14_set_http_proxy_env.patch:
+ set http_proxy environment from gconf
- 21_strip_blank_space.patch:
+ strip blank spaces from 'cmd'
* drop:
- debian/patches/15_configure
- debian/patches/16_fix_ftbfs.patch