diff -Nru ogmrip-0.12.2/debian/changelog ogmrip-0.12.2/debian/changelog --- ogmrip-0.12.2/debian/changelog 2008-10-04 21:48:37.000000000 +0100 +++ ogmrip-0.12.2/debian/changelog 2008-10-12 22:31:45.000000000 +0100 @@ -1,4 +1,4 @@ -ogmrip (0.12.2-0.0ubuntu1~ppa2) hardy; urgency=low +ogmrip (0.12.2-0.0ubuntu1~ppa3) hardy; urgency=low * Merge from Debian unstable. * Ubuntu changes: @@ -11,6 +11,8 @@ + Set Depends for ocr to tesseract | ocrad | gocr . (LP: #247826) + Modify Maintainer value to match the DebianMaintainerField specification. + Set debhelper Build-Depends to 6 + - debian/patches/02-ogmrip-empty-subs.patch + + Fix encoding with subs when the image is empty. -- Julien Lavergne Sat, 04 Oct 2008 22:48:31 +0200 diff -Nru /tmp/wcayeRvM8r/ogmrip-0.12.2/debian/patches/02-ogmrip-empty-subs.patch /tmp/15048Xq2lM/ogmrip-0.12.2/debian/patches/02-ogmrip-empty-subs.patch --- ogmrip-0.12.2/debian/patches/02-ogmrip-empty-subs.patch 1970-01-01 01:00:00.000000000 +0100 +++ ogmrip-0.12.2/debian/patches/02-ogmrip-empty-subs.patch 2008-10-12 22:29:28.000000000 +0100 @@ -0,0 +1,22 @@ +--- ogmrip-0.12/subrip/subp2pgm.c Wed Oct 8 10:16:33 2008 ++++ ogmrip/subrip/subp2pgm.c Wed Oct 8 09:35:36 2008 +@@ -349,7 +349,7 @@ + unsigned int start_pts, end_pts; + char buf[256]; + +- if (!forced || spudec_forced (spudec)) ++ if ((!forced || spudec_forced (spudec)) && w > 0 && h > 0) + { + subno ++; + +@@ -402,7 +402,10 @@ + for (n = 0; n < 16; n++) + { + if (fscanf (file, "%d", &c) != 1) ++ { ++ fprintf (stderr, "unable to get palette information from file '%s'\n", palet_file); + break; ++ } + + /* YUV */ + palette[n] = c; diff -Nru /tmp/wcayeRvM8r/ogmrip-0.12.2/debian/patches/series /tmp/15048Xq2lM/ogmrip-0.12.2/debian/patches/series --- ogmrip-0.12.2/debian/patches/series 2008-10-03 16:27:25.000000000 +0100 +++ ogmrip-0.12.2/debian/patches/series 2008-10-12 22:29:58.000000000 +0100 @@ -1 +1,2 @@ 01_desktop-file-fix-category.patch +02-ogmrip-empty-subs.patch