-
Committer:
Bazaar Package Importer
-
Author(s):
Robert Ancell
-
Date:
2011-02-21 13:43:04 UTC
-
mfrom:
(1.59.12 upstream)
(3.3.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20110221134304-qcln0ywhg0yy58b3
Tags: 2.28.1-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control.in:
- Add Vcs-Bzr link
- Recommend libdconf0
- Don't use "linux-any" for now since soyuz doesn't handle it
- Break with current bamf and wncksync versions that need an update
- Suggest python-subunit for dev package
* debian/libglib2.0-0.symbols:
- Updated the symbols list for the gio launcher handler
* debian/patches/01_gettext-desktopfiles.patch:
- Updated to use gettext for X-GNOME-Fullname too
* debian/patches/05_file_size_units.patch:
- Use base 10 units in g_format_size_for_display() (disabled)
* debian/patches/20_mime_extension_point.patch:
- Disabled
* debian/patches/61_glib-compile-schemas-path.patch:
- Don't use that change since there is a depends which assures to the
upstream binary location to be there
* debian/patches/71_gio_launch_handler.patch:
- New GIO default launch handle feature required for wncksync
* debian/watch:
- Watch for unstable versions