-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2011-07-11 10:45:11 UTC
-
mfrom:
(1.2.61 upstream)
(3.1.8 sid)
-
Revision ID:
james.westby@ubuntu.com-20110711104511-8j9j5mqxqvul9ilz
Tags: 3.1.1-0ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
- Launchpad integration:
+ Add 01_lpi.patch.
+ debian/rules; Run autotools.
+ debian/control.in: Add liblaunchpad-integration-3.0-dev build dep.
- debian/rules: Add a shlibs rule for libcryptui0a (>= 3.0.0)
- Add 11_ubuntu-keyserver.patch: Make Ubuntu keyserver the default
- debian/watch: Check for unstable versions.
- debian/rules, debian/control.in: Enable libnotify support (temporarily
disabled in Debian).
* New upstream release.
* Unfuzz patches for new version.