~ubuntu-branches/ubuntu/trusty/cheese/trusty

Viewing all changes in revision 100.

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2013-12-15 04:02:52 UTC
  • mfrom: (1.6.4) (7.1.22 sid)
  • Revision ID: package-import@ubuntu.com-20131215040252-ofr61hte3zjvzkld
Tags: 3.10.1-1sid1ubuntu1
* 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: