Package: defoma Version: 0.11.11 Severity: wishlist Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu ubuntu-patch natty
Hello, in Ubuntu we are trying to get rid of Perl in the default installation (that is, the full Perl, not perl-base of course); for this I'm currently enabling the remaining reverse dependencies. With this patch, this package will work with just perl-base. I know that defoma itself is obsolete, but I'm filing this patch for the record. It'll probably still take some time until defoma is fully eliminated. Thanks for considering, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
* Drop perl dependency and imports of File::Copy, and replace the copy() calls with /bin/cp. diff -Nru defoma-0.11.11ubuntu1/debian/rules defoma-0.11.11ubuntu2/debian/rules --- defoma-0.11.11ubuntu1/debian/rules 2010-06-03 17:24:14.000000000 -0400 +++ defoma-0.11.11ubuntu2/debian/rules 2010-11-01 14:02:14.000000000 -0400 @@ -74,7 +74,7 @@ # You may want to make some executables suid here. # dh_suidregister dh_installdeb - dh_perl + dh_perl -d dh_gencontrol dh_md5sums dh_builddeb diff -Nru defoma-0.11.11ubuntu1/libs/libdefoma-subst.pl defoma-0.11.11ubuntu2/libs/libdefoma-subst.pl --- defoma-0.11.11ubuntu1/libs/libdefoma-subst.pl 2010-06-03 17:24:14.000000000 -0400 +++ defoma-0.11.11ubuntu2/libs/libdefoma-subst.pl 2010-11-01 14:15:55.000000000 -0400 @@ -27,7 +27,7 @@ chomp($newfile); - copy($rulefile, $newfile); + system('cp', $rulefile, $newfile); system('/usr/bin/sensible-editor', $newfile); my @new = (); @@ -59,7 +59,7 @@ defoma_subst_close($sb); term_all(); - copy($newfile, $rulefile); + system('cp', $newfile, $rulefile); unlink($newfile, $newfile.'~'); mylock(0); diff -Nru defoma-0.11.11ubuntu1/man/po4a/po/fr.po defoma-0.11.11ubuntu2/man/po4a/po/fr.po --- defoma-0.11.11ubuntu1/pm/Defoma/Common.pm 2010-06-03 17:24:14.000000000 -0400 +++ defoma-0.11.11ubuntu2/pm/Defoma/Common.pm 2010-11-01 14:15:15.000000000 -0400 @@ -730,7 +730,6 @@ use strict; #no strict 'subs'; use POSIX; -use File::Copy; use vars qw(@ISA $DEFAULT_PACKAGE $DEFAULT_CATEGORY @ACCEPT_CATEGORIES $APPINFO); @@ -960,7 +959,7 @@ my $suffix = (USERSPACE) ? "udefoma" : "defoma"; - unless (copy($OriginalScripts{$app}, SCRIPTDIR . "/$app.$suffix")) { + if (system('cp', $OriginalScripts{$app}, SCRIPTDIR . "/$app.$suffix") != 0) { printe("Failed to copy " . $OriginalScripts{$app} . "to " . SCRIPTDIR . "."); set_app_info($app, 'error', 1); diff -Nru defoma-0.11.11ubuntu1/src/defoma defoma-0.11.11ubuntu2/src/defoma --- defoma-0.11.11ubuntu1/src/defoma 2010-06-03 17:24:14.000000000 -0400 +++ defoma-0.11.11ubuntu2/src/defoma 2010-11-01 14:03:37.000000000 -0400 @@ -4,7 +4,6 @@ use strict; use POSIX; use vars qw($COMNAME %SIG $ARG0); -use File::Copy; use Debian::Defoma::Common; use Debian::Defoma::Font; use Debian::Defoma::Id;
signature.asc
Description: Digital signature