~ubuntu-desktop/cheese/ubuntu

Viewing all changes in revision 86.

  • Committer: Robert Ancell
  • Date: 2013-12-16 01:28:31 UTC
  • mfrom: (85.1.1 ubuntu)
  • Revision ID: robert.ancell@canonical.com-20131216012831-p7kqz2upt08rud2s
* Merge from Debian unstable. (LP: #1261080) Remaining changes:
  - debian/cheese-common.install, debian/source_cheese.py:
    + Add Apport hook.
  - debian/control:
    + Bump conflicts/replaces since we didn't take the
      libcheese-gtk-dev/ libcheese-doc split until raring.
    + Build-Depends on good gstreamer plugins instead of bad.
    + Suggest gnome-video-effects-extra, as well.
  - debian/patches/use-plugins-good.patch:
    + The camerabin plugin is part of the good gstreamer plugins
      in Ubuntu.
* debian/patches/fix-help-license.patch,
  debian/patches/fix-um-crop-license.patch:
  - Removed, fixed upstream.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: