diff -Nur ogmrip-0.12.3/debian/changelog ogmrip-jaunty/debian/changelog
--- ogmrip-0.12.3/debian/changelog	2009-04-03 20:32:20.000000000 +0200
+++ ogmrip-jaunty/debian/changelog	2009-04-16 22:42:16.000000000 +0200
@@ -1,3 +1,14 @@
+ogmrip (0.12.3-0.2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian-multimedia (LP: #351021)
+   - Rebuild and fix for livdvdread (LP: #330684)
+  * Ubuntu changes:
+   - debian/libogmrip0.install & debian/install:
+    + Don't install the .desktop file in the library package (LP: #204448)
+    + Add libtiff4-dev for srt support.
+
+ -- Julien Lavergne <julien.lavergne@gmail.com>  Thu, 16 Apr 2009 22:42:09 +0200
+
 ogmrip (0.12.3-0.2) unstable; urgency=low
 
   * New patch 03_configure to remove check for eject, mplayer and mencoder
@@ -36,6 +47,38 @@
 
  -- Christian Marillat <marillat@debian.org>  Wed, 07 Jan 2009 17:07:31 +0100
 
+ogmrip (0.12.2-0.0ubuntu3) jaunty; urgency=low
+
+  * debian/control:
+   - Add libtiff4-dev as Build-Depends to add tesseract support.
+  * debian/rules:
+   - Add --with-ocr=auto flag to add runtime ocr detection (LP: #247826).
+
+ -- Julien Lavergne <julien.lavergne@gmail.com>  Thu, 27 Nov 2008 20:33:27 +0100
+
+ogmrip (0.12.2-0.0ubuntu2) jaunty; urgency=low
+
+  * debian/patches/02_ogmrip-empty-subs.patch
+   - From upstream, fix a crash in encoding when there is subtitles and blank 
+     images (LP: #288818).
+  * debian/control
+   - Change tesseract Depends to tesseract-ocr to match Ubuntu package name.
+
+ -- Julien Lavergne <julien.lavergne@gmail.com>  Sat, 25 Oct 2008 00:14:39 +0200
+
+ogmrip (0.12.2-0.0ubuntu1) intrepid; urgency=low
+
+  * Merge from debian-multimedia (LP: #268063), remaining changes:
+   - debian/libogmrip0.install & debian/install:
+    + Don't install the .desktop file in the library package (LP: #204448)
+   - debian/rules:
+    + Drop configure flag --with-ocr=ocrad (introduced to fix LP #200600), 
+      as ogmrip now detect at runtime the ocr.
+   - debian/control:
+    + Set Depends for ocr to tesseract | ocrad | gocr . (LP: #247826)
+
+ -- Julien Lavergne <julien.lavergne@gmail.com>  Fri, 03 Oct 2008 17:43:54 +0200
+
 ogmrip (0.12.2-0.0) unstable; urgency=low
 
   * New upstream release.
diff -Nur ogmrip-0.12.3/debian/control ogmrip-jaunty/debian/control
--- ogmrip-0.12.3/debian/control	2009-04-03 20:32:20.000000000 +0200
+++ ogmrip-jaunty/debian/control	2009-04-16 22:38:13.000000000 +0200
@@ -1,7 +1,8 @@
 Source: ogmrip
 Section: graphics
 Priority: optional
-Maintainer: Christian Marillat <marillat@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christian Marillat <marillat@debian.org>
 Bugs: mailto:marillat@debian.org
 Homepage: http://ogmrip.sourceforge.net
 Standards-Version: 3.8.1
@@ -9,7 +10,7 @@
  libenchant-dev, vorbis-tools (>= 1.0), lame, libgconf2-dev, libglade2-dev,
  mkvtoolnix (>= 0.9.5), libtheora-dev, faac, libvorbis-dev, libdbus-glib-1-dev,
  libx264-dev, libenca-dev, ogmtools, libxml-parser-perl, quilt, intltool,
- libnotify-dev
+ libnotify-dev, libtiff4-dev
 
 Package: ogmrip
 Architecture: any
diff -Nur ogmrip-0.12.3/debian/install ogmrip-jaunty/debian/install
--- ogmrip-0.12.3/debian/install	2009-04-03 20:32:20.000000000 +0200
+++ ogmrip-jaunty/debian/install	2009-04-03 20:50:07.000000000 +0200
@@ -4,3 +4,4 @@
 debian/tmp/usr/share/pixmaps
 debian/tmp/usr/share/man/man1
 debian/tmp/usr/share/gconf/schemas/ogmrip.schemas
+debian/tmp/usr/share/applications/ogmrip.desktop
diff -Nur ogmrip-0.12.3/debian/libogmrip0.install ogmrip-jaunty/debian/libogmrip0.install
--- ogmrip-0.12.3/debian/libogmrip0.install	2009-04-03 20:32:20.000000000 +0200
+++ ogmrip-jaunty/debian/libogmrip0.install	2009-04-03 20:50:08.000000000 +0200
@@ -1,3 +1,2 @@
 debian/tmp/usr/lib/*.so.0*
-debian/tmp/usr/share/applications/ogmrip.desktop
 debian/tmp/usr/lib/ogmrip