Merge lp:~ari-tczew/cheese/ubuntu into lp:~ubuntu-desktop/cheese/ubuntu

[Artur Rona]

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-15 20:29:26 +0000
+++ debian/changelog	2013-12-16 00:16:37 +0000
@@ -1,3 +1,70 @@
+cheese (3.10.1-1sid1ubuntu1) trusty; urgency=low
+
+  * 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.
+
+ -- Artur Rona <[e-mail]>  Sun, 15 Dec 2013 04:02:52 +0100
+
+cheese (3.10.1-1sid1) unstable; urgency=low
+
+  * Depend on gstreamer1.0-clutter for cluttervideosink (Closes: #729253)
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 12 Nov 2013 20:43:25 +0100
+
+cheese (3.10.1-1) unstable; urgency=low
+
+  [ Jeremy Bicha ]
+  * debian/patches/fix-help-license.patch:
+    - Backport clarification that the help files are licensed CC-BY-SA 3.0
+  * debian/patches/fix-um-crop-license.patch:
+    - Backport relicensing of this file as GPL-2+ instead of GPL-3+
+  * debian/copyright:
+    - Updated and converted to the 1.0 copyright format
+  * debian/control.in:
+    - Suggest gnome-video-effects-frei0r
+
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Bump build-dependencies according to configure.ac:
+    - libglib2.0-dev to >= 2.32.0
+    - libclutter-1.0-dev to >= 1.13.2
+  * Drop debian/patches: now included in upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Thu, 17 Oct 2013 16:29:42 +0200
+
+cheese (3.8.3-1) unstable; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release.
+  * debian/control.in:
+    - Drop build-depends on libgee-dev
+    - Drop alternate build-depends on valac-0.18 since it's no longer
+      in Debian
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+  * Drop 99_ltmain_as-needed.patch since we are running autoreconf with the
+    --as-needed argument.
+  * Bump Standards-Version to 3.9.4. No further changes.
+  * Revert the changes in 3.6.1-1 which bumped the build-dependencies to force
+    the use of the versions in experimental.
+  * Revert the changes in 3.6.2-1. We want a strict dependency on
+    cheese-common for the gsettings schema.
+
+ -- Michael Biebl <[e-mail]>  Tue, 27 Aug 2013 11:07:57 +0200
+
 cheese (3.8.3-0ubuntu1) saucy; urgency=low
 
   * New upstream release
 
=== modified file 'debian/control'
--- debian/control	2013-12-15 20:29:26 +0000
+++ debian/control	2013-12-16 00:16:37 +0000
@@ -7,11 +7,10 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Jeremy Bicha <[e-mail]>, Laurent Bigonville <[e-mail]>, Sjoerd Simons <[e-mail]>
-Standards-Version: 3.9.3
+Uploaders: Andreas Henriksson <[e-mail]>, Debian GNOME Maintainers <[e-mail]>, Jeremy Bicha <[e-mail]>, Laurent Bigonville <[e-mail]>, Michael Biebl <[e-mail]>
+Standards-Version: 3.9.4
 Homepage: http://projects.gnome.org/cheese/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/cheese/
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu
 Build-Depends: cdbs (>= 0.4.93~),
                debhelper (>= 9),
                dh-autoreconf,
@@ -22,18 +21,18 @@
                intltool (>= 0.50.0),
                rarian-compat,
                valac (>= 0.18),
-               libglib2.0-dev (>= 2.34.0),
+               libglib2.0-dev (>= 2.32.0),
                libgdk-pixbuf2.0-dev,
-               libgtk-3-dev (>= 3.6),
-               libgnome-desktop-3-dev (>= 3.6),
+               libgtk-3-dev (>= 3.4.4),
+               libgnome-desktop-3-dev (>= 2.91.6),
                libgstreamer1.0-dev (>= 0.11.0),
                libgstreamer-plugins-base1.0-dev (>= 0.11.0),
                libgstreamer-plugins-good1.0-dev (>= 0.11.0),
                libcairo2-dev (>= 1.10.0),
                libpango1.0-dev (>= 1.28.0),
                librsvg2-dev (>= 2.32.0),
-               libclutter-1.0-dev (>= 1.13.0),
-               libclutter-gtk-1.0-dev (>= 1.4.0),
+               libclutter-1.0-dev (>= 1.13.2),
+               libclutter-gtk-1.0-dev (>= 0.91.8),
                libclutter-gst-2.0-dev (>= 1.9.0),
                x11proto-core-dev,
                libcanberra-gtk3-dev (>= 0.26),
@@ -49,15 +48,15 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         cheese-common (>= 3.4),
+         cheese-common (= ${source:Version}),
          gnome-video-effects
 Recommends: gvfs,
             gnome-icon-theme,
             hicolor-icon-theme,
             nautilus-sendto,
             yelp
-Suggests: gnome-video-effects-extra,
-          gnome-video-effects-frei0r
+Suggests: gnome-video-effects-frei0r,
+          gnome-video-effects-extra
 Description: tool to take pictures and videos from your webcam
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -85,7 +84,7 @@
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         cheese-common (>= 3.4)
+         cheese-common (= ${source:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: tool to take pictures and videos from your webcam - widgets
@@ -124,7 +123,8 @@
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         cheese-common (>= 3.4),
+         cheese-common (= ${source:Version}),
+         gstreamer1.0-clutter,
          gstreamer1.0-plugins-base (>= 0.11.0),
          gstreamer1.0-plugins-good (>= 0.11.0),
          gstreamer1.0-x
 
=== modified file 'debian/control.in'
--- debian/control.in	2013-12-15 20:29:26 +0000
+++ debian/control.in	2013-12-16 00:16:37 +0000
@@ -4,10 +4,9 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://projects.gnome.org/cheese/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/cheese/
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/cheese/
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/cheese/ubuntu
 Build-Depends: cdbs (>= 0.4.93~),
                debhelper (>= 9),
                dh-autoreconf,
@@ -18,18 +17,18 @@
                intltool (>= 0.50.0),
                rarian-compat,
                valac (>= 0.18),
-               libglib2.0-dev (>= 2.34.0),
+               libglib2.0-dev (>= 2.32.0),
                libgdk-pixbuf2.0-dev,
-               libgtk-3-dev (>= 3.6),
-               libgnome-desktop-3-dev (>= 3.6),
+               libgtk-3-dev (>= 3.4.4),
+               libgnome-desktop-3-dev (>= 2.91.6),
                libgstreamer1.0-dev (>= 0.11.0),
                libgstreamer-plugins-base1.0-dev (>= 0.11.0),
                libgstreamer-plugins-good1.0-dev (>= 0.11.0),
                libcairo2-dev (>= 1.10.0),
                libpango1.0-dev (>= 1.28.0),
                librsvg2-dev (>= 2.32.0),
-               libclutter-1.0-dev (>= 1.13.0),
-               libclutter-gtk-1.0-dev (>= 1.4.0),
+               libclutter-1.0-dev (>= 1.13.2),
+               libclutter-gtk-1.0-dev (>= 0.91.8),
                libclutter-gst-2.0-dev (>= 1.9.0),
                x11proto-core-dev,
                libcanberra-gtk3-dev (>= 0.26),
@@ -45,15 +44,15 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         cheese-common (>= 3.4),
+         cheese-common (= ${source:Version}),
          gnome-video-effects
 Recommends: gvfs,
             gnome-icon-theme,
             hicolor-icon-theme,
             nautilus-sendto,
             yelp
-Suggests: gnome-video-effects-extra,
-          gnome-video-effects-frei0r
+Suggests: gnome-video-effects-frei0r,
+          gnome-video-effects-extra
 Description: tool to take pictures and videos from your webcam
  A webcam application that supports image and video capture. Makes
  it easy to take photos and videos of you, your friends, pets or whatever
@@ -81,7 +80,7 @@
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         cheese-common (>= 3.4)
+         cheese-common (= ${source:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: tool to take pictures and videos from your webcam - widgets
@@ -120,7 +119,8 @@
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         cheese-common (>= 3.4),
+         cheese-common (= ${source:Version}),
+         gstreamer1.0-clutter,
          gstreamer1.0-plugins-base (>= 0.11.0),
          gstreamer1.0-plugins-good (>= 0.11.0),
          gstreamer1.0-x
 
=== removed file 'debian/patches/99_ltmain_as-needed.patch'
--- debian/patches/99_ltmain_as-needed.patch	2011-12-27 20:09:40 +0000
+++ debian/patches/99_ltmain_as-needed.patch	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-Index: cheese-3.2.1/ltmain.sh
-===================================================================
---- cheese-3.2.1.orig/ltmain.sh	2011-10-17 22:20:56.000000000 +0200
-+++ cheese-3.2.1/ltmain.sh	2011-11-13 14:07:28.230942270 +0100
-@@ -5787,6 +5787,11 @@
- 	arg=$func_stripname_result
- 	;;
- 
-+      -Wl,--as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
-@@ -6147,6 +6152,15 @@
- 	lib=
- 	found=no
- 	case $deplib in
-+	-Wl,--as-needed)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
 
=== removed file 'debian/patches/fix-help-license.patch'
--- debian/patches/fix-help-license.patch	2013-12-15 20:29:26 +0000
+++ debian/patches/fix-help-license.patch	1970-01-01 00:00:00 +0000
@@ -1,247 +0,0 @@
-From a4dbb82074231322d099c9943d7f2929dc711173 Mon Sep 17 00:00:00 2001
-From: David King <[e-mail]>
-Date: Fri, 28 Jun 2013 13:20:02 +0100
-Subject: [PATCH] License help under CC-BY-SA 3.0 Unported
-
-The help was not explicitly under a license, as described in bug 703238.
-Specify the license as CC-BY-SA 3.0 to match with other GNOME help:
-
-https://wiki.gnome.org/DocumentationProject/Licensing
-
-License clarification approved by help contributors (found with
-"git shortlog help/C/*.page") as listed below:
-
-Signed-off-by: Jeremy Bicha <[e-mail]>
-Signed-off-by: Ekaterina Gerasimova <[e-mail]>
-Signed-off-by: Michael Hill <[e-mail]>
-Signed-off-by: Tiffany Ann Antopolski <[e-mail]>
-Signed-off-by: Julita Inca <[e-mail]>
----
- help/C/burst-mode.page            | 2 ++
- help/C/effects-apply.page         | 2 ++
- help/C/index.page                 | 2 ++
- help/C/introduction.page          | 2 ++
- help/C/legal.xml                  | 8 ++++++++
- help/C/photo-delete.page          | 2 ++
- help/C/photo-save.page            | 2 ++
- help/C/photo-take.page            | 2 ++
- help/C/photo-view.page            | 2 ++
- help/C/pref-countdown.page        | 2 ++
- help/C/pref-flash.page            | 2 ++
- help/C/pref-fullscreen.page       | 2 ++
- help/C/pref-image-properties.page | 2 ++
- help/C/pref-resolution.page       | 2 ++
- help/C/video-record.page          | 2 ++
- help/Makefile.am                  | 1 +
- 21 files changed, 47 insertions(+)
- create mode 100644 help/C/legal.xml
-
-diff --git a/help/C/burst-mode.page b/help/C/burst-mode.page
-index c0d64ed..c53593b 100644
---- a/help/C/burst-mode.page
-+++ b/help/C/burst-mode.page
-@@ -20,6 +20,8 @@
-       <email its:translate="no">[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc><gui>Burst mode</gui> takes several photos rapidly. Change your pose
-     in between each shot!</desc>
-   </info>
- 
-diff --git a/help/C/effects-apply.page b/help/C/effects-apply.page
-index 9c36128..73a0014 100644
---- a/help/C/effects-apply.page
-+++ b/help/C/effects-apply.page
-@@ -15,6 +15,8 @@
-       <email>[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Add fun effects to your photos and videos, like turning yourself green
-     or distorting the picture like a funhouse mirror.</desc>
-   </info>
-diff --git a/help/C/index.page b/help/C/index.page
-index bfa126c..d2a0a79 100644
---- a/help/C/index.page
-+++ b/help/C/index.page
-@@ -16,6 +16,8 @@
-       <email>[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Cheese lets you take photos and videos using your webcam. You can
-     even add special effects!</desc>
- 
-diff --git a/help/C/introduction.page b/help/C/introduction.page
-index da21997..7b5e355 100644
---- a/help/C/introduction.page
-+++ b/help/C/introduction.page
-@@ -20,6 +20,8 @@
-       <email its:translate="no">[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Introduction to the <app>Cheese</app> webcam application.</desc>
-   </info>
- 
-diff --git a/help/C/legal.xml b/help/C/legal.xml
-new file mode 100644
-index 0000000..aa36246
---- /dev/null
-+++ b/help/C/legal.xml
-@@ -0,0 +1,8 @@
-+<license xmlns="http://projectmallard.org/1.0/"
-+         href="http://creativecommons.org/licenses/by-sa/3.0/">
-+
-+  <p>This work is licensed under a
-+  <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
-+  Attribution-ShareAlike 3.0 Unported License</link>.</p>
-+
-+</license>
-diff --git a/help/C/photo-delete.page b/help/C/photo-delete.page
-index 987d5bd..416f167 100644
---- a/help/C/photo-delete.page
-+++ b/help/C/photo-delete.page
-@@ -16,6 +16,8 @@
-       <email>[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Remove photos and videos that you no longer want to keep.</desc>
-   </info>
- 
-diff --git a/help/C/photo-save.page b/help/C/photo-save.page
-index c396043..11e83e1 100644
---- a/help/C/photo-save.page
-+++ b/help/C/photo-save.page
-@@ -16,6 +16,8 @@
-       <email>[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Save a photo or video in a different folder.</desc>
-   </info>
- 
-diff --git a/help/C/photo-take.page b/help/C/photo-take.page
-index 64be7ec..c3fbcce 100644
---- a/help/C/photo-take.page
-+++ b/help/C/photo-take.page
-@@ -24,6 +24,8 @@
-       <email its:translate="no">[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Use your webcam to take photos instead of videos.</desc>
-   </info>
- 
-diff --git a/help/C/photo-view.page b/help/C/photo-view.page
-index b0198ca..a133aff 100644
---- a/help/C/photo-view.page
-+++ b/help/C/photo-view.page
-@@ -16,6 +16,8 @@
-       <email>[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Photos and videos will automatically appear in the photo stream.</desc>
-   </info>
- 
-diff --git a/help/C/pref-countdown.page b/help/C/pref-countdown.page
-index 976c390..8c0e38a 100644
---- a/help/C/pref-countdown.page
-+++ b/help/C/pref-countdown.page
-@@ -19,6 +19,8 @@
-       <email its:translate="no">[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Remove the countdown so that photos are taken instantly.</desc>
-   </info>
- 
-diff --git a/help/C/pref-flash.page b/help/C/pref-flash.page
-index 5ec3f8e..5faa86e 100644
---- a/help/C/pref-flash.page
-+++ b/help/C/pref-flash.page
-@@ -19,6 +19,8 @@
-       <email its:translate="no">[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Stop the screen from flashing white when taking a photo.</desc>
-   </info>
- 
-diff --git a/help/C/pref-fullscreen.page b/help/C/pref-fullscreen.page
-index ca3ad63..c6901be 100644
---- a/help/C/pref-fullscreen.page
-+++ b/help/C/pref-fullscreen.page
-@@ -10,6 +10,8 @@
-       <email>[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Enable and disable fullscreen mode</desc>
-   </info>
- 
-diff --git a/help/C/pref-image-properties.page b/help/C/pref-image-properties.page
-index 8f32188..02daa79 100644
---- a/help/C/pref-image-properties.page
-+++ b/help/C/pref-image-properties.page
-@@ -20,6 +20,8 @@
-       <email its:translate="no">[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Adjust the saturation, contrast, brightness and hue to make photos and videos look better.</desc>
-   </info>
- 
-diff --git a/help/C/pref-resolution.page b/help/C/pref-resolution.page
-index 26bdf87..956c53c 100644
---- a/help/C/pref-resolution.page
-+++ b/help/C/pref-resolution.page
-@@ -18,6 +18,8 @@
-       <email its:translate="no">[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>The resolution of a video or photo determines how much detail you can
-     see in it, changing it will affect the file size.</desc>
- 
-diff --git a/help/C/video-record.page b/help/C/video-record.page
-index 315304a..f4b01bd 100644
---- a/help/C/video-record.page
-+++ b/help/C/video-record.page
-@@ -19,6 +19,8 @@
-       <email its:translate="no">[e-mail]</email>
-     </credit>
- 
-+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-+
-     <desc>Use your webcam to record short movies for sharing with friends.</desc>
-   </info>
- 
-diff --git a/help/Makefile.am b/help/Makefile.am
-index 60d2703..76529d6 100644
---- a/help/Makefile.am
-+++ b/help/Makefile.am
-@@ -19,6 +19,7 @@ HELP_FILES = \
- 	effects-apply.page \
- 	index.page \
- 	introduction.page \
-+	legal.xml \
- 	photo-delete.page \
- 	photo-save.page \
- 	photo-take.page \
 
=== removed file 'debian/patches/fix-um-crop-license.patch'
--- debian/patches/fix-um-crop-license.patch	2013-12-15 20:29:26 +0000
+++ debian/patches/fix-um-crop-license.patch	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-From 7aab154c74ee9a6487e38300d907bd797fd5ba0e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <[e-mail]>
-Date: Sun, 30 Jun 2013 01:40:26 +0000
-Subject: um-crop-area.c: Relicense to GPLv2+
-
-This makes the file fit in better with the rest of Cheese,
-license-wise.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=703239
----
-diff --git a/libcheese/um-crop-area.c b/libcheese/um-crop-area.c
-index 8b9323d..60ca9be 100644
---- a/libcheese/um-crop-area.c
-+++ b/libcheese/um-crop-area.c
-@@ -4,7 +4,7 @@
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 3 of the License, or
-+ * the Free Software Foundation; either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-15 20:29:26 +0000
+++ debian/patches/series	2013-12-16 00:16:37 +0000
@@ -1,4 +1,1 @@
-#99_ltmain_as-needed.patch
 use-plugins-good
-fix-help-license.patch
-fix-um-crop-license.patch
 
=== modified file 'debian/patches/use-plugins-good'
--- debian/patches/use-plugins-good	2013-12-15 20:29:26 +0000
+++ debian/patches/use-plugins-good	2013-12-16 00:16:37 +0000
@@ -1,12 +1,12 @@
 Description: Look for -plugins-good as camerabin has moved there from -bad (Ubuntu local change, for now)
 Author: Iain Lane <[e-mail]>
 Forwarded: not-needed
+Last-Update: 2013-12-15
 
-Index: cheese-3.8.1/configure.ac
-===================================================================
---- cheese-3.8.1.orig/configure.ac	2013-04-27 11:08:35.486714948 -0400
-+++ cheese-3.8.1/configure.ac	2013-04-27 11:08:51.234714290 -0400
-@@ -65,8 +65,8 @@
+diff -pruN -x '*~' cheese-3.10.1.orig/configure.ac cheese-3.10.1/configure.ac
+--- cheese-3.10.1.orig/configure.ac	2013-10-14 16:15:17.000000000 +0200
++++ cheese-3.10.1/configure.ac	2013-12-15 03:53:25.000000000 +0100
+@@ -65,8 +65,8 @@ GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0"
  LIBGNOMEDESKTOP_REQUIRED="gnome-desktop-3.0 >= 2.91.6"
  GSTREAMER_VERSION=0.11.0
  GSTREAMER_REQUIRED="gstreamer-plugins-base-1.0 >= $GSTREAMER_VERSION gstreamer-1.0 >= $GSTREAMER_VERSION gstreamer-pbutils-1.0 >= $GSTREAMER_VERSION"
@@ -17,7 +17,7 @@
  CAIRO_REQUIRED="cairo >= 1.10.0"
  PANGOCAIRO_REQUIRED="pangocairo >= 1.28.0"
  LIBRSVG_REQUIRED="librsvg-2.0 >= 2.32.0"
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ PKG_CHECK_MODULES([CHEESE],
    $GOBJECT_REQUIRED
    $GDK_PIXBUF_REQUIRED
    $GSTREAMER_REQUIRED