diff -u mandvd-2.5-4/debian/rules mandvd-2.5-4/debian/rules --- mandvd-2.5-4/debian/rules +++ mandvd-2.5-4/debian/rules @@ -5 +5 @@ - +include /usr/share/cdbs/1/rules/simple-patchsys.mk diff -u mandvd-2.5-4/debian/changelog mandvd-2.5-4/debian/changelog --- mandvd-2.5-4/debian/changelog +++ mandvd-2.5-4/debian/changelog @@ -1,3 +1,10 @@ +mandvd (2.5-4-0ubuntu1.1) jaunty-proposed; urgency=low + + * Adjust FPS to fix building of animated menu when NTSC is selected, + fixes LP: #420616. + + -- Alessio Treglia Sun, 30 Aug 2009 09:50:50 +0200 + mandvd (2.5-4-0ubuntu1) jaunty; urgency=low * Initial release (LP: #105464). only in patch2: unchanged: --- mandvd-2.5-4.orig/debian/patches/01-ntsc_projects_fps.patch +++ mandvd-2.5-4/debian/patches/01-ntsc_projects_fps.patch @@ -0,0 +1,15 @@ +Description: Fix building of animated menu when NTSC is selected. +Vendor: Ubuntu +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mandvd/+bug/420616 +diff -Nur -x '*.orig' -x '*~' mandvd-2.5-4/dvdbuild.cpp mandvd-2.5-4.new/dvdbuild.cpp +--- mandvd-2.5-4/dvdbuild.cpp 2008-07-07 14:50:01.000000000 +0200 ++++ mandvd-2.5-4.new/dvdbuild.cpp 2009-08-30 09:49:21.304189697 +0200 +@@ -963,7 +963,7 @@ + else + { + tmp_001 = +- "jpeg2yuv -f " + QString::number (projfps) + " -I p -l " + ++ "jpeg2yuv -f 30 -I p -l " + + QString::number (nbre_occur->value ()) + " -j \"" + + wpathtotalproj + + "/xxxgibmenanim%06d.jpg\" | mpeg2enc -f 3 -b " + tmp_006 +