The following commit has been merged in the master branch:
commit 047cf6685c72fbe837dd2f5feb5a40979ac19226
Author: Guillem Jover <[email protected]>
Date: Sun Jan 6 03:51:07 2013 +0100
perl: Place strict and warning pragma uses as the first thing
diff --git a/dselect/methods/Dselect/Ftp.pm b/dselect/methods/Dselect/Ftp.pm
index be9abb7..a8bd239 100644
--- a/dselect/methods/Dselect/Ftp.pm
+++ b/dselect/methods/Dselect/Ftp.pm
@@ -12,14 +12,14 @@
package Dselect::Ftp;
-use Net::FTP;
-use Data::Dumper;
-
use strict;
use warnings;
use Exporter qw(import);
+use Net::FTP;
+use Data::Dumper;
+
our @EXPORT = qw(%config yesno do_connect do_mdtm add_site edit_site
edit_config read_config store_config view_mirrors nb);
our %config;
diff --git a/scripts/t/100_Dpkg_Version.t b/scripts/t/100_Dpkg_Version.t
index db7b2dd..d5fa6e9 100644
--- a/scripts/t/100_Dpkg_Version.t
+++ b/scripts/t/100_Dpkg_Version.t
@@ -13,12 +13,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More;
-use Dpkg::ErrorHandling;
-
use strict;
use warnings;
+use Test::More;
+use Dpkg::ErrorHandling;
+
report_options(quiet_warnings => 1);
my @tests = <DATA>;
diff --git a/scripts/t/150_Dpkg_Package.t b/scripts/t/150_Dpkg_Package.t
index 5ea2988..338067d 100644
--- a/scripts/t/150_Dpkg_Package.t
+++ b/scripts/t/150_Dpkg_Package.t
@@ -13,11 +13,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More tests => 6;
-
use strict;
use warnings;
+use Test::More tests => 6;
+
use_ok('Dpkg::Package');
ok(pkg_name_is_illegal(undef));
diff --git a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
b/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
index 1bda4a5..6ad0902 100644
--- a/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
+++ b/scripts/t/190_Dpkg_Shlibs_Cppfilt.t
@@ -13,11 +13,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More tests => 124;
-
use strict;
use warnings;
+use Test::More tests => 124;
+
use_ok('Dpkg::Shlibs::Cppfilt');
# Simple C++ demangling tests
diff --git a/scripts/t/200_Dpkg_Shlibs.t b/scripts/t/200_Dpkg_Shlibs.t
index 99e5073..f91736a 100644
--- a/scripts/t/200_Dpkg_Shlibs.t
+++ b/scripts/t/200_Dpkg_Shlibs.t
@@ -13,13 +13,13 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+use strict;
+use warnings;
+
use Test::More tests => 106;
use Cwd;
use IO::String;
-use strict;
-use warnings;
-
use_ok('Dpkg::Shlibs');
my $tmp;
diff --git a/scripts/t/300_Dpkg_BuildOptions.t
b/scripts/t/300_Dpkg_BuildOptions.t
index cd1d7d7..29ef736 100644
--- a/scripts/t/300_Dpkg_BuildOptions.t
+++ b/scripts/t/300_Dpkg_BuildOptions.t
@@ -13,12 +13,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More tests => 24;
-use Dpkg::ErrorHandling;
-
use strict;
use warnings;
+use Test::More tests => 24;
+use Dpkg::ErrorHandling;
+
use_ok('Dpkg::BuildOptions');
{
diff --git a/scripts/t/400_Dpkg_Deps.t b/scripts/t/400_Dpkg_Deps.t
index 93a53ce..b37a1c6 100644
--- a/scripts/t/400_Dpkg_Deps.t
+++ b/scripts/t/400_Dpkg_Deps.t
@@ -13,12 +13,12 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More tests => 20;
-
use strict;
use warnings;
+use Test::More tests => 20;
use Dpkg::Arch qw(get_host_arch);
+
use_ok('Dpkg::Deps');
my $field_multiline = ' , , libgtk2.0-common (= 2.10.13-1) , libatk1.0-0 (>=
diff --git a/scripts/t/500_Dpkg_Path.t b/scripts/t/500_Dpkg_Path.t
index 930c8cd..2164f50 100644
--- a/scripts/t/500_Dpkg_Path.t
+++ b/scripts/t/500_Dpkg_Path.t
@@ -13,11 +13,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More tests => 16;
-
use strict;
use warnings;
+use Test::More tests => 16;
+
use_ok('Dpkg::Path', 'canonpath', 'resolve_symlink',
'check_files_are_the_same', 'get_pkg_root_dir',
'guess_pkg_root_dir', 'relative_to_pkg_root');
diff --git a/scripts/t/700_Dpkg_Control.t b/scripts/t/700_Dpkg_Control.t
index 2018db5..60b5688 100644
--- a/scripts/t/700_Dpkg_Control.t
+++ b/scripts/t/700_Dpkg_Control.t
@@ -13,10 +13,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More tests => 22;
-
use strict;
use warnings;
+
+use Test::More tests => 22;
use IO::String;
BEGIN {
diff --git a/scripts/t/800_Dpkg_IPC.t b/scripts/t/800_Dpkg_IPC.t
index 4af1d7b..c49d0dd 100644
--- a/scripts/t/800_Dpkg_IPC.t
+++ b/scripts/t/800_Dpkg_IPC.t
@@ -13,10 +13,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More tests => 8;
-
use strict;
use warnings;
+
+use Test::More tests => 8;
use File::Temp qw(tempfile);
use_ok('Dpkg::IPC');
diff --git a/scripts/t/850_Dpkg_Compression.t b/scripts/t/850_Dpkg_Compression.t
index 4bac076..6f0e9b0 100644
--- a/scripts/t/850_Dpkg_Compression.t
+++ b/scripts/t/850_Dpkg_Compression.t
@@ -13,11 +13,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More tests => 13;
-
use strict;
use warnings;
+use Test::More tests => 13;
+
use_ok('Dpkg::Compression');
use_ok('Dpkg::Compression::FileHandle');
diff --git a/scripts/t/910_merge_changelogs.t b/scripts/t/910_merge_changelogs.t
index 932ae4e..20d8cc1 100644
--- a/scripts/t/910_merge_changelogs.t
+++ b/scripts/t/910_merge_changelogs.t
@@ -13,6 +13,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+use strict;
+use warnings;
+
use Test::More tests => 3;
use Dpkg::IPC;
@@ -20,9 +23,6 @@ use File::Spec;
use File::Compare;
use File::Temp qw(tempfile);
-use strict;
-use warnings;
-
my $srcdir = $ENV{srcdir} || '.';
my $datadir = "$srcdir/t/910_merge_changelogs";
diff --git a/test/000_pod.t b/test/000_pod.t
index 0282a7d..4003277 100644
--- a/test/000_pod.t
+++ b/test/000_pod.t
@@ -13,11 +13,11 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-use Test::More;
-
use strict;
use warnings;
+use Test::More;
+
eval 'use Test::Pod 1.00';
plan skip_all => 'Test::Pod 1.00 required for testing POD' if $@;
my @poddirs = ( $ENV{srcdir} || '.' );
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
