Switch 'dpkg-gettext.pl' to a new style perl module Dpkg::Gettext.

ChangeLog

@@ -1,3 +1,20 @@
+2007-07-22  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-gettext.pl: Move ...
+	* scripts/Dpkg/Gettext.pm: ... here. Add a package statement.
+	Fix all users.
+	* scripts/Makefile.am (dist_pkglib_SCRIPTS): Remove 'dpkg-gettext.pl'.
+	(nobase_dist_perllib_DATA): Add 'Dpkg/Gettext.pm'.
+
+	* scripts/822-date.pl: Do not push $dpkglibdir into @INC anymore.
+	* scripts/cleanup-info.pl: Likewise.
+	* scripts/controllib.pl: Likewise.
+	* scripts/dpkg-divert.pl: Likewise.
+	* scripts/dpkg-scansources.pl: Likewise.
+	* scripts/dpkg-statoverride.pl: Likewise.
+	* scripts/install-info.pl: Likewise.
+	* scripts/update-alternatives.pl: Likewise.
+
 2007-07-22  Guillem Jover  <guillem@debian.org>
 
 	* scripts/cleanup-info.pl: Use new Dpkg module, and remove variable

debian/changelog

@@ -16,6 +16,7 @@ dpkg (1.14.6) UNRELEASED; urgency=low
     - Unify author and copyright information formatting.
   * Move variables automatically modified at build time to a new style perl
     module and make all programs use the new module..
+  * Switch 'dpkg-gettext.pl' to a new style perl module Dpkg::Gettext.
 
   [ Updated scripts translations ]
   * French (Frédéric Bothamy, Christian Perrier).

debian/dpkg.install

@@ -7,7 +7,6 @@ usr/bin/dpkg
 usr/bin/dpkg-deb
 usr/bin/dpkg-query
 usr/bin/dpkg-split
-usr/lib/dpkg/dpkg-gettext.pl
 usr/lib/dpkg/enoent
 usr/lib/dpkg/mksplit
 usr/sbin

scripts/822-date.pl

@@ -4,9 +4,8 @@ use strict;
 use warnings;
 
 use Dpkg;
+use Dpkg::Gettext;
 
-push(@INC, $dpkglibdir);
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 require 'controllib.pl';

scripts/dpkg-gettext.pl

@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 # Copied from /usr/share/perl5/Debconf/Gettext.pm
 
+package Dpkg::Gettext;
+
 use strict;
 use warnings;
 

scripts/Makefile.am

@@ -55,11 +55,11 @@ CLEANFILES = \
 
 perllibdir = $(PERL_LIBDIR)
 nobase_dist_perllib_DATA = \
+	Dpkg/Gettext.pm \
 	Dpkg.pm
 
 dist_pkglib_SCRIPTS = \
-	controllib.pl \
-	dpkg-gettext.pl
+	controllib.pl
 
 
 do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):" \

scripts/cleanup-info.pl

@@ -25,9 +25,8 @@ use strict;
 use warnings;
 
 use Dpkg;
+use Dpkg::Gettext;
 
-push(@INC,$dpkglibdir);
-require 'dpkg-gettext.pl';
 textdomain("dpkg");
 
 ($0) = $0 =~ m:.*/(.+):;

scripts/controllib.pl

@@ -6,9 +6,8 @@ use warnings;
 use English;
 use POSIX qw(:errno_h);
 use Dpkg;
+use Dpkg::Gettext;
 
-push(@INC,$dpkglibdir);
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 our $sourcepackage; # - name of sourcepackage

scripts/dpkg-architecture.pl

@@ -23,11 +23,11 @@ use strict;
 use warnings;
 
 use Dpkg;
+use Dpkg::Gettext;
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';
 
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 sub version {

scripts/dpkg-checkbuilddeps.pl

@@ -6,13 +6,13 @@ use warnings;
 
 use Getopt::Long;
 use Dpkg;
+use Dpkg::Gettext;
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';
 
 our %fi;
 
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 sub usage {

scripts/dpkg-distaddfile.pl

@@ -6,11 +6,11 @@ use warnings;
 use POSIX;
 use POSIX qw(:errno_h :signal_h);
 use Dpkg;
+use Dpkg::Gettext;
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';
 
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 my $fileslistfile = 'debian/files';

scripts/dpkg-divert.pl

@@ -4,9 +4,8 @@ use strict;
 use warnings;
 
 use Dpkg;
+use Dpkg::Gettext;
 
-push (@INC, $dpkglibdir);
-require 'dpkg-gettext.pl';
 textdomain("dpkg");
 
 my $enoent = `$dpkglibdir/enoent` || die sprintf(_g("Cannot get ENOENT value from %s: %s"), "$dpkglibdir/enoent", $!);

scripts/dpkg-genchanges.pl

@@ -6,6 +6,7 @@ use warnings;
 use POSIX;
 use POSIX qw(:errno_h :signal_h);
 use Dpkg;
+use Dpkg::Gettext;
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';
@@ -17,7 +18,6 @@ our %substvar;
 our $sourcepackage;
 our $host_arch;
 
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 my @changes_fields = qw(Format Date Source Binary Architecture Version

scripts/dpkg-gencontrol.pl

@@ -6,6 +6,7 @@ use warnings;
 use POSIX;
 use POSIX qw(:errno_h);
 use Dpkg;
+use Dpkg::Gettext;
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';
@@ -18,7 +19,6 @@ our @pkg_dep_fields;
 our $sourcepackage;
 our $host_arch;
 
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 my @control_fields = (qw(Package Source Version Architecture Essential Origin

scripts/dpkg-parsechangelog.pl

@@ -6,11 +6,11 @@ use warnings;
 use POSIX;
 use POSIX qw(:errno_h);
 use Dpkg;
+use Dpkg::Gettext;
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';
 
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 my $format ='debian';

scripts/dpkg-scanpackages.pl

@@ -6,10 +6,10 @@ use strict;
 use IO::Handle;
 use IO::File;
 use Dpkg;
+use Dpkg::Gettext;
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 our @pkg_dep_fields;

scripts/dpkg-scansources.pl

@@ -30,9 +30,8 @@ use strict;
 use warnings;
 
 use Dpkg;
+use Dpkg::Gettext;
 
-push(@INC,$dpkglibdir);
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 use Getopt::Long ();

scripts/dpkg-shlibdeps.pl

@@ -9,6 +9,7 @@ use warnings;
 use English;
 use POSIX qw(:errno_h :signal_h);
 use Dpkg;
+use Dpkg::Gettext;
 
 my $shlibsoverride= '/etc/dpkg/shlibs.override';
 my $shlibsdefault= '/etc/dpkg/shlibs.default';
@@ -27,7 +28,6 @@ my $i=0; grep($depstrength{$_}= ++$i, @depfields);
 push(@INC,$dpkglibdir);
 require 'controllib.pl';
 
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 #use strict;

scripts/dpkg-source.pl

@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use Dpkg;
+use Dpkg::Gettext;
 
 my @filesinarchive;
 my %dirincluded;
@@ -72,7 +73,6 @@ our $quiet_warnings;
 our %substvar;
 our @src_dep_fields;
 
-require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");
 
 my @dsc_fields = (qw(Format Source Binary Architecture Version Origin

scripts/dpkg-statoverride.pl

@@ -6,9 +6,8 @@ use warnings;
 use POSIX;
 use POSIX qw(:errno_h :signal_h);
 use Dpkg;
+use Dpkg::Gettext;
 
-push (@INC, $dpkglibdir);
-require 'dpkg-gettext.pl';
 textdomain("dpkg");
 
 my $verbose = 1;

scripts/install-info.pl

@@ -2,9 +2,8 @@
 
 use Text::Wrap;
 use Dpkg;
+use Dpkg::Gettext;
 
-push (@INC, $dpkglibdir);
-require 'dpkg-gettext.pl';
 textdomain("dpkg");
 
 # fixme: sort entries

scripts/update-alternatives.pl

@@ -4,9 +4,8 @@ use strict;
 use warnings;
 
 use Dpkg;
+use Dpkg::Gettext;
 
-push (@INC, $dpkglibdir);
-require 'dpkg-gettext.pl';
 textdomain("dpkg");
 
 # Global variables: