diff -Nru dvdrip-0.98.11/debian/changelog dvdrip-0.98.11/debian/changelog --- dvdrip-0.98.11/debian/changelog 2010-08-08 16:32:18.000000000 +0100 +++ dvdrip-0.98.11/debian/changelog 2012-06-18 17:51:24.000000000 +0100 @@ -1,3 +1,13 @@ +dvdrip (1:0.98.11-0ubuntu4) quantal; urgency=low + + * Correct perl binary path. Fixes FTBS. + * Follow location of transcode utilities which have been folded back + into the main transcode package. + * test.pl: requires a HOME directory to perform the testing, make + a debian/test-home for this and ensure it is cleaned out. + + -- Andy Whitcroft Tue, 12 Jun 2012 15:03:07 +0100 + dvdrip (1:0.98.11-0ubuntu3) maverick; urgency=low * Newer transcode does not support --use_rgb option anymore (LP: #614758). diff -Nru dvdrip-0.98.11/debian/control dvdrip-0.98.11/debian/control --- dvdrip-0.98.11/debian/control 2010-08-08 16:32:08.000000000 +0100 +++ dvdrip-0.98.11/debian/control 2012-06-18 15:01:01.000000000 +0100 @@ -13,7 +13,7 @@ Package: dvdrip Architecture: all Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, - transcode (>= 2:1.0.2-0.8), + transcode (>= 3:1.1.7-1), libgtk2-ex-formfactory-perl (>= 0.66), libevent-perl, libevent-execflow-perl (>= 0.64), @@ -26,7 +26,7 @@ lsdvd, ffmpeg, ogmtools, - transcode-utils, + transcode, dvdrip-utils Recommends: xine-ui, subtitleripper, dvdrip-doc Suggests: mjpegtools, mplayer, rar, hal, vorbis-tools, libxvidcore4 diff -Nru dvdrip-0.98.11/debian/patches/04-correct-perl-binary-path dvdrip-0.98.11/debian/patches/04-correct-perl-binary-path --- dvdrip-0.98.11/debian/patches/04-correct-perl-binary-path 1970-01-01 01:00:00.000000000 +0100 +++ dvdrip-0.98.11/debian/patches/04-correct-perl-binary-path 2012-06-18 15:05:21.000000000 +0100 @@ -0,0 +1,14 @@ +Description: correct path to perl binary + Fix #! path for perl to fix localisation. +Author: Andy Whitcroft +Last-Update: 2012-06-18 +Index: dvdrip-0.98.11/tools/gensplash +=================================================================== +--- dvdrip-0.98.11.orig/tools/gensplash 2009-02-28 18:27:59.000000000 +0000 ++++ dvdrip-0.98.11/tools/gensplash 2012-06-12 15:03:28.435321357 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + use strict; + use lib "lib"; diff -Nru dvdrip-0.98.11/debian/patches/05-test.pl-needs-HOME.patch dvdrip-0.98.11/debian/patches/05-test.pl-needs-HOME.patch --- dvdrip-0.98.11/debian/patches/05-test.pl-needs-HOME.patch 1970-01-01 01:00:00.000000000 +0100 +++ dvdrip-0.98.11/debian/patches/05-test.pl-needs-HOME.patch 2012-06-18 17:51:53.000000000 +0100 @@ -0,0 +1,17 @@ +Description: library requires valid HOME + The contained library requires a valid HOME. Use the debian + directory as HOME to permit tests to work. +Author: Andy Whitcroft +Last-Update: 2012-06-18 +Index: dvdrip-0.98.11/test.pl +=================================================================== +--- dvdrip-0.98.11.orig/test.pl 2012-06-18 14:52:33.108758423 +0100 ++++ dvdrip-0.98.11/test.pl 2012-06-18 17:51:44.694072658 +0100 +@@ -27,6 +27,7 @@ + } + + BEGIN { ++ $ENV{HOME} = 'debian/test-home'; + $Video::DVDRip::PREFERENCE_FILE = "$ENV{HOME}/.dvdriprc"; + $Video::DVDRip::MAKE_TEST = 1; + } diff -Nru dvdrip-0.98.11/debian/patches/series dvdrip-0.98.11/debian/patches/series --- dvdrip-0.98.11/debian/patches/series 2010-08-08 16:27:05.000000000 +0100 +++ dvdrip-0.98.11/debian/patches/series 2012-06-18 14:03:53.000000000 +0100 @@ -1,2 +1,4 @@ 02_fix_desktop_file.patch 03-tc11_rgb_fix.patch +04-correct-perl-binary-path +05-test.pl-needs-HOME.patch diff -Nru dvdrip-0.98.11/debian/rules dvdrip-0.98.11/debian/rules --- dvdrip-0.98.11/debian/rules 2010-02-24 18:24:15.000000000 +0000 +++ dvdrip-0.98.11/debian/rules 2012-06-18 17:50:33.000000000 +0100 @@ -12,6 +12,7 @@ override_dh_auto_clean: dh_auto_clean find lib/ l10n/ -name "*.mo" -type f | xargs rm -f + rm -rf $(CURDIR)/debian/test-home override_dh_auto_install: $(MAKE) install PREFIX=$(CURDIR)/debian/dvdrip/usr \ @@ -22,6 +23,7 @@ dh_movefiles --sourcedir=debian/dvdrip override_dh_auto_build: + mkdir -p $(CURDIR)/debian/test-home cd l10n && $(MAKE) update-mo -cd l10n && $(MAKE) install SKIP_UNPACK_REQUIRED_MODULES=1 perl Makefile.PL INSTALLDIRS=vendor