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

diff --git a/ChangeLog b/ChangeLog
index 479cd29d6d0ce0e7204a65a3dff7f627c5be7dc6..81505b6beb0e691ee88626afc54c17b5053cc6ac 100644 (file)
--- a/ChangeLog
+++ b/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

diff --git a/debian/changelog b/debian/changelog
index 8a44db8a3bfe43efcd8b6c9a2dcee6f68d280853..a3be66cc3c5b5662ddde97adf40a3658c5163e1e 100644 (file)
--- a/debian/changelog
+++ b/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).

diff --git a/debian/dpkg.install b/debian/dpkg.install
index 478405f715ef451b4c2969a106a6dd943f8c4a53..e1d4b4892a435809ab7acdff908aab688aac6d35 100644 (file)
--- a/debian/dpkg.install
+++ b/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

diff --git a/scripts/822-date.pl b/scripts/822-date.pl
index c3145451225b675b5f54f789af3ef229b1891a7e..28cfab3311445168917acc0a7247c7b8d49f4ce3 100755 (executable)
--- a/scripts/822-date.pl
+++ b/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';

diff --git a/scripts/dpkg-gettext.pl b/scripts/Dpkg/Gettext.pm
similarity index 95%
rename from scripts/dpkg-gettext.pl
rename to scripts/Dpkg/Gettext.pm
index c7dca780be42cebbd29af3a69b01f1c9d4f44060..99bba388a0fd5347e5b78d90f3d33b8dc0ff58a3 100644 (file)
--- a/scripts/dpkg-gettext.pl
+++ b/scripts/Dpkg/Gettext.pm
@@ -1,6 +1,8 @@
 #!/usr/bin/perl -w
 # Copied from /usr/share/perl5/Debconf/Gettext.pm
 
+package Dpkg::Gettext;
+
 use strict;
 use warnings;
 

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index e83f2abaa21e177d302c0be37363d07ea643bacc..454db544630d261b7cc0a72e826c4220ec8c0a54 100644 (file)
--- a/scripts/Makefile.am
+++ b/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):" \

diff --git a/scripts/cleanup-info.pl b/scripts/cleanup-info.pl
index 5fcbdc8b79a54eff4ef4649c87988698dc3b0732..0adcbc96a2625b8348175d9bd8b5f9f72bd65e97 100755 (executable)
--- a/scripts/cleanup-info.pl
+++ b/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:.*/(.+):;

diff --git a/scripts/controllib.pl b/scripts/controllib.pl
index 96731cab5475fa853b3dcd99578ff32f32e1037c..08cbd31121452565557719f82d0c411e53f240a7 100755 (executable)
--- a/scripts/controllib.pl
+++ b/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

diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index c199e0bafa65e0471b64304a01fb7318830098d2..5588976d166a4ab77e7f8a6eb7ce98ba4bfa29b7 100755 (executable)
--- a/scripts/dpkg-architecture.pl
+++ b/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 {

diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 881631685053670b94a701a5c488b24959f2553d..9e30b84c7b62e51ff9fb6c6a627491feb29659a2 100755 (executable)
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/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 {

diff --git a/scripts/dpkg-distaddfile.pl b/scripts/dpkg-distaddfile.pl
index 155550118ba08b2e5d1397d7145d008a28cac259..e7ebb329aab8a022a0edbe737e812fe130fde7df 100755 (executable)
--- a/scripts/dpkg-distaddfile.pl
+++ b/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';

diff --git a/scripts/dpkg-divert.pl b/scripts/dpkg-divert.pl
index 784847172849dd97c07f1a301a864c26677fa1ad..253209ef980f774d5ea749415bf9ebb40132ae7b 100755 (executable)
--- a/scripts/dpkg-divert.pl
+++ b/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", $!);

diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 51c90a6debfc112145cbbdd1773f1b4bad0ee1a8..42564c9da93a8e98d02f5169c71fc942c681e347 100755 (executable)
--- a/scripts/dpkg-genchanges.pl
+++ b/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

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 6f7ec1a59090a5242b1384096a54606de4b560b8..bdaaa00ff7d90c64c889bfac4852ee921bcb51a5 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/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

diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index 2ef223b5aefdd49fbc1d33a922c109c0464d9009..4a2e370cc5bf4786736f71185308d9ab7df90f1f 100755 (executable)
--- a/scripts/dpkg-parsechangelog.pl
+++ b/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';

diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 2581391ec220baade799324dba81e1346b3bbe0b..fd4c1ce2aa585b3d3cb0a3e80729b7a06daef125 100755 (executable)
--- a/scripts/dpkg-scanpackages.pl
+++ b/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;

diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index 4eade815ba40bf51e0278e62d7511dee905caf1c..72749ff3f68d45d6774012abc1edafa435021596 100755 (executable)
--- a/scripts/dpkg-scansources.pl
+++ b/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 ();

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 198d72671ec10dbe02d68f33717ee20d8ab3eb2f..95795fd2c935aacbacd330299ec31c0593d46d9c 100755 (executable)
--- a/scripts/dpkg-shlibdeps.pl
+++ b/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;

diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 4c92e3b1e38a4ecafba6f89e66e14a16693b9912..1ed1213b340284820085ea58f2dfc4acd2cc2b21 100755 (executable)
--- a/scripts/dpkg-source.pl
+++ b/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

diff --git a/scripts/dpkg-statoverride.pl b/scripts/dpkg-statoverride.pl
index e75eceff2ccd5687dbb6d37201d41e2bc0f99f8a..06cabbc5a2df3efbbf4dd2f96ba207edd0b13f11 100755 (executable)
--- a/scripts/dpkg-statoverride.pl
+++ b/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;

diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index 35f30d32c43a7192d2497164cbf5ba2e8ce63b8c..906322c5a96a156ddcd0fded479b8b22b387891c 100755 (executable)
--- a/scripts/install-info.pl
+++ b/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

diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index 1f879a0ce4919412f42395991d541c77e8c1adcb..f851ccc5b17b710aa13b889b6dfab3ee9aa3574b 100755 (executable)
--- a/scripts/update-alternatives.pl
+++ b/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: