Viewing all changes in revision 22.
- Committer: Bazaar Package Importer
- Date: 2010-09-09 12:37:45 UTC
- mfrom: (1.2.8 upstream) (3.1.17 experimental)
- Revision ID: james.westby@ubuntu.com-20100909123745-dphljojkgwa54td9
* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
- Add Vcs-Bzr link
- Build-depend on python-launchpad-integration
- Drop hal from Recommends to Suggests. This version has the patch applied
to not crash without hal. Hal-B-gone from our CDs!
* debian/rules:
- Use gnome.mk so a translation template is built
* debian/patches/01_lpi.patch:
- launchpad integration
* debian/control:
- Add Vcs-Bzr link
- Build-depend on python-launchpad-integration
- Drop hal from Recommends to Suggests. This version has the patch applied
to not crash without hal. Hal-B-gone from our CDs!
* debian/rules:
- Use gnome.mk so a translation template is built
* debian/patches/01_lpi.patch:
- launchpad integration
- files added:
- pitivi/pixmaps/pitivi-group-24.svg
- files removed:
- .pc/02_remove_version_from_title.patch
- .pc/02_remove_version_from_title.patch/pitivi
- .pc/02_remove_version_from_title.patch/pitivi/ui
- .pc/02_uri-sink-async.patch
- .pc/02_uri-sink-async.patch/pitivi
- .pc/02_uri-sink-async.patch/pitivi/factories
- .pc/03_set_mime_type.patch
- .pc/lp537619_gdk_cairo_reset_clip.patch
- .pc/lp537619_gdk_cairo_reset_clip.patch/pitivi
- .pc/lp537619_gdk_cairo_reset_clip.patch/pitivi/ui
- files modified:
- .pc/01_disable-devel-mode.patch/bin/pitivi.in
expand all
collapse all
added
removed
pitivi/pixmaps/pitivi-group-24.svg
pitivi/pixmaps/pitivi-group.svg
pitivi/pixmaps/pitivi-keyframe-24.svg
pitivi/pixmaps/pitivi-keyframe.svg
pitivi/pixmaps/pitivi-relink-24.svg
pitivi/pixmaps/pitivi-relink.svg
pitivi/pixmaps/pitivi-ungroup-24.svg
pitivi/pixmaps/pitivi-ungroup.svg
pitivi/pixmaps/pitivi-unlink-24.svg
pitivi/pixmaps/pitivi-unlink.svg
