-
Committer:
Bazaar Package Importer
-
Author(s):
Bilal Akhtar
-
Date:
2010-12-01 12:16:30 UTC
-
mfrom:
(1.1.10 sid)
-
Revision ID:
james.westby@ubuntu.com-20101201121630-ma21g2girx4uvgxx
Tags: 2.0.2-5ubuntu1
* Merge from Debian Unstable. (LP: #683484) Remaining changes:
- debian/control.in:
+ remove build-dependency on sng (universe).
+ add sharutil b-d.
- do not do the sng->png at build time but instead include a static
uuencoded copy.
- debian/patches/02_always_ask.patch: added new '--always-ask-pass'
commandline switch. This patch was 01_always_ask.patch earlier.
- debian/patches/21_strip_blank_space.patch: strip blank spaces from
'cmd'.
* Changes merged with Debian:
- debian/patches/07_desktop_in_ship.patch: don't display root-terminal
menu entry.