diff -u ov51x-jpeg-1.5.4/debian/control ov51x-jpeg-1.5.4/debian/control
--- ov51x-jpeg-1.5.4/debian/control
+++ ov51x-jpeg-1.5.4/debian/control
@@ -1,7 +1,8 @@
 Source: ov51x-jpeg
 Section: graphics
 Priority: extra
-Maintainer: Romain Beauxis <toots@rastageeks.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Romain Beauxis <toots@rastageeks.org>
 Build-Depends-Indep: bzip2
 Build-Depends: debhelper (>= 5)
 Standards-Version: 3.7.3
diff -u ov51x-jpeg-1.5.4/debian/changelog ov51x-jpeg-1.5.4/debian/changelog
--- ov51x-jpeg-1.5.4/debian/changelog
+++ ov51x-jpeg-1.5.4/debian/changelog
@@ -1,3 +1,12 @@
+ov51x-jpeg (1.5.4-1ubuntu0.1) hardy-proposed; urgency=low
+
+  * Fix compilation on 2.6.24 kernels. (LP: #190450). This patch is included
+    in the 1.5.5 upstream release.
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- James Westby <james.westby@canonical.com>  Tue, 29 Apr 2008 14:12:10 +0100
+
 ov51x-jpeg (1.5.4-1) unstable; urgency=low
 
   * New upstream release
only in patch2:
unchanged:
--- ov51x-jpeg-1.5.4.orig/ov51x-jpeg-core.c
+++ ov51x-jpeg-1.5.4/ov51x-jpeg-core.c
@@ -6583,7 +6583,9 @@
 	.owner =	THIS_MODULE,
 	.name =		"OV511 USB Camera",
 	.type =		VID_TYPE_CAPTURE,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
 	.hardware =	VID_HARDWARE_OV511,
+#endif
 	.open =		ov51x_v4l1_open,
 	.close =	ov51x_v4l1_close,
 	.read =		ov51x_v4l1_read,
@@ -6608,7 +6610,9 @@
 	.owner =	THIS_MODULE,
 	.name =		"OV51x USB Camera",
 	.type =		VID_TYPE_CAPTURE,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24)
 	.hardware =	VID_HARDWARE_OV511,
+#endif
 	.fops =		&ov511_fops,
 	.release =	video_device_release,
 	.minor =	-1,