=== modified file 'debian/changelog'
--- debian/changelog	2015-03-05 12:12:48 +0000
+++ debian/changelog	2015-03-12 18:57:57 +0000
@@ -1,3 +1,13 @@
+tvtime (1.0.2-14ubuntu3) vivid; urgency=medium
+
+  * Improve error message about invalid framesize:
+    - The "Frame too short" error message is not quite right. The problem is
+      that tvtime expects exactly the same height as available on a TV standard,
+      e.g. 480 or 576. Any different value (even bigger) won't work.
+    - Renamed tvtime-1.0.2-videoinput.patch to tvtime-1.0.2-uvc.patch
+
+ -- POJAR GEORGE <geoubuntu@gmail.com>  Thu, 12 Mar 2015 17:37:24 +0000
+
 tvtime (1.0.2-14ubuntu2) vivid; urgency=medium
 
   * Updated debian/patches/tvtime-1.0.2-alsamixer.patch:

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-28 06:07:20 +0000
+++ debian/patches/series	2015-03-12 18:57:57 +0000
@@ -6,7 +6,7 @@
 pal_audio_mode_persistence.patch
 fullscreen.diff
 tvtime-1.0.2-screensaver.patch
-tvtime-1.0.2-videoinput.patch
+tvtime-1.0.2-uvc.patch
 tvtime-1.0.2-osd.patch
 tvtime-1.0.2-usage.patch
 typo.diff

=== added file 'debian/patches/tvtime-1.0.2-uvc.patch'
--- debian/patches/tvtime-1.0.2-uvc.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/tvtime-1.0.2-uvc.patch	2015-03-12 18:57:57 +0000
@@ -0,0 +1,33 @@
+Description: tvtime does not work with UVC webcams
+Bug-Ubuntu: http://launchpad.net/bugs/383669
+Author: POJAR GEORGE <geoubuntu@gmail.com>
+Index: tvtime-1.0.2/src/videoinput.c
+===================================================================
+--- tvtime-1.0.2.orig/src/videoinput.c
++++ tvtime-1.0.2/src/videoinput.c
+@@ -386,6 +386,7 @@ uint8_t *videoinput_next_frame( videoinp
+  
+         videoinput_get_aspect( vidin );
+         cur_buf.type = vidin->capbuffers[ 0 ].vidbuf.type;
++        cur_buf.memory = vidin->capbuffers[ 0 ].vidbuf.memory;
+         if( ioctl( vidin->grab_fd, VIDIOC_DQBUF, &cur_buf ) < 0 ) {
+             /* some drivers return EIO when there is no signal */
+             if( errno != EIO ) {
+@@ -733,11 +734,13 @@ videoinput_t *videoinput_new( const char
+         if( vidin->height != imgformat.fmt.pix.height ) {
+                 fprintf( stderr, "\n"
+     "    Your capture card driver: %s\n"
+-    "    does not support full size studio-quality images required by tvtime.\n"
+-    "    This is true for many low-quality webcams.  Please select a\n"
++    "    does not support images with height %d required by tvtime.\n"
++    "    This is true for many webcams. Please select a\n"
+     "    different video device for tvtime to use with the command line\n"
+-    "    option --device.\n\n", vidin->drivername );
+-            sprintf( error_string, "Frames too short from %s", vidin->shortdriver );
++    "    option --device.\n\n", vidin->drivername, vidin->height);
++            sprintf( error_string, "%s: frames height adjusted to %d (wanted %d)",
++                     vidin->shortdriver,
++                     imgformat.fmt.pix.height, vidin->height);
+             close( vidin->grab_fd );
+             free( vidin );
+             return 0;

=== removed file 'debian/patches/tvtime-1.0.2-videoinput.patch'
--- debian/patches/tvtime-1.0.2-videoinput.patch	2014-04-28 06:07:20 +0000
+++ debian/patches/tvtime-1.0.2-videoinput.patch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-## Description: tvtime does not work with UVC webcams
-## Origin: upstream, http://pkgs.fedoraproject.org/gitweb/?p=tvtime.git;a=patch;h=f93446d369f3bb5b5db4196de196d81580b57d04
-## Bug-Ubuntu: http://launchpad.net/bugs/383669
-## Bug-Debian: 
-## Author: Tomas Smetana
-## Forwarded: not-needed
-Index: tvtime-1.0.2/src/videoinput.c
-===================================================================
---- tvtime-1.0.2.orig/src/videoinput.c	2014-04-28 06:28:09.044908425 +0000
-+++ tvtime-1.0.2/src/videoinput.c	2014-04-28 06:28:09.040908425 +0000
-@@ -386,6 +386,7 @@
-  
-         videoinput_get_aspect( vidin );
-         cur_buf.type = vidin->capbuffers[ 0 ].vidbuf.type;
-+        cur_buf.memory = vidin->capbuffers[ 0 ].vidbuf.memory;
-         if( ioctl( vidin->grab_fd, VIDIOC_DQBUF, &cur_buf ) < 0 ) {
-             /* some drivers return EIO when there is no signal */
-             if( errno != EIO ) {