-
Committer:
Bazaar Package Importer
-
Author(s):
Robert Ancell
-
Date:
2010-08-25 14:22:37 UTC
-
mfrom:
(1.6.7 upstream)
(27.2.12 sid)
-
Revision ID:
james.westby@ubuntu.com-20100825142237-sydsqo7b83686pui
Tags: 1:3.30.3-1ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
* debian/control:
- Add Vcs-Bzr link
* debian/libgtkhtml-editor0.shlibs:
* debian/libgtkhtml3.14-19.shlibs:
- Add epoch (accidentally added in Ubuntu)
* debian/patches/gtkhtml3.14_ftbfs.diff:
- Build without DGTK_DISABLE_DEPRECATED to fix FTBFS
* debian/watch:
- Watch for unstable versions