-
Committer:
Bazaar Package Importer
-
Author(s):
Steve Langasek
-
Date:
2011-05-17 19:46:25 UTC
-
mfrom:
(2.1.10 sid)
-
Revision ID:
james.westby@ubuntu.com-20110517194625-awyf9lkvyohk71ni
Tags: 1.12-3.1ubuntu1
* Merge from Debian unstable, remaining changes:
- Add wget-udeb to ship wget.gnu as alternative to busybox wget
implementation.
- Keep build dependencies in main:
+ debian/control: remove info2man build-dep
+ debian/patches/series: disable wget-infopod_generated_manpage
- Depend on libssl-dev 0.9.8k-7ubuntu4 (LP: #503339)
- Mark wget Multi-Arch: foreign, so packages that aren't of the same arch
can depend on it.