diff -Nru cheese-2.22.3/debian/changelog cheese-2.22.3/debian/changelog
--- cheese-2.22.3/debian/changelog	2008-09-04 11:39:59.000000000 +0000
+++ cheese-2.22.3/debian/changelog	2008-09-04 11:39:59.000000000 +0000
@@ -1,12 +1,3 @@
-cheese (2.22.3-0ubuntu1.1) hardy-proposed; urgency=low
-
-  * add 80_fix_webcam.patch with fix from 
-    http://bazaar.launchpad.net/~vcs-imports/cheese/trunk/revision/647
-    to make sure the video stream gets properly stopped if user clicks 
-    the "Stop Recording" button (LP: #258110)
-
- -- Oliver Grawert <ogra@ubuntu.com>  Fri, 15 Aug 2008 11:49:15 +0200
-
 cheese (2.22.3-0ubuntu1) hardy-proposed; urgency=low
 
   * New upstream release (LP: #244615).
diff -Nru /tmp/AwKH7u58iA/cheese-2.22.3/debian/patches/80_fix_webcam.patch /tmp/GoN9SYq7Xc/cheese-2.22.3/debian/patches/80_fix_webcam.patch
--- cheese-2.22.3/debian/patches/80_fix_webcam.patch	2008-09-04 11:39:59.000000000 +0000
+++ cheese-2.22.3/debian/patches/80_fix_webcam.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' cheese-2.22.1/src/cheese-webcam.c cheese-2.22.1.new/src/cheese-webcam.c
---- cheese-2.22.1/src/cheese-webcam.c	2008-04-07 21:35:26.000000000 +0000
-+++ cheese-2.22.1.new/src/cheese-webcam.c	2008-08-15 09:48:46.000000000 +0000
-@@ -223,10 +223,9 @@
- 
-   if (GST_MESSAGE_TYPE(message) == GST_MESSAGE_EOS)
-   {
-+    g_print ("Received EOS message\n"); 
-     g_signal_emit (webcam, webcam_signals [VIDEO_SAVED], 0);
- 
--    gst_element_set_locked_state (priv->video_source, FALSE);
--    gst_element_set_locked_state (priv->audio_source, FALSE);
-     cheese_webcam_change_sink (webcam, priv->video_display_bin, 
-                                priv->photo_save_bin, priv->video_save_bin);
-     priv->is_recording = FALSE;
-@@ -951,10 +950,8 @@
-   CheeseWebcamPrivate* priv = CHEESE_WEBCAM_GET_PRIVATE (webcam);
- 
-   /* Send EOS message down the pipeline by stopping video and audio source*/
--  gst_element_set_state (priv->video_source, GST_STATE_NULL);
--  gst_element_set_locked_state (priv->video_source, TRUE);
--  gst_element_set_state (priv->audio_source, GST_STATE_NULL);
--  gst_element_set_locked_state (priv->audio_source, TRUE);
-+  gst_element_send_event (priv->video_source, gst_event_new_eos ()); 
-+  gst_element_send_event (priv->audio_source, gst_event_new_eos ()); 
- }
- 
- void