[SCM] Debian packaging of dh-make-perl branch, master, updated. debian/0.76-1-29-g0898116
Axel Beckert
abe at deuxchevaux.org
Wed Mar 6 17:40:48 UTC 2013
The following commit has been merged in the master branch:
commit 08981163f233094e4dcb3b1385321e8558667aa5
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Wed Mar 6 18:34:06 2013 +0100
Whitespace fixes
Git-Dch: ignore
diff --git a/dh-make-perl b/dh-make-perl
index 80fb2ea..266c1e1 100755
--- a/dh-make-perl
+++ b/dh-make-perl
@@ -184,7 +184,7 @@ as for --depends applies here - use only when needed.
=item B<--bdependsi> I<BUILD-DEPENDS-INDEP>
Manually specify the string to be used for the module's build-dependencies
-for architecture-independent builds. Same notes as those for the --depends
+for architecture-independent builds. Same notes as those for the --depends
and --bdepends options apply here.
Note that for --depends, --bdepends and --bdependsi you can also specify that
@@ -202,8 +202,8 @@ Debian archive.
=item B<--closes> I<ITPBUG>
-Manually specify the ITP bug number that this package closes. If not
-given, B<dh-make-perl> will try to connect to bugs.debian.org to fetch the
+Manually specify the ITP bug number that this package closes. If not
+given, B<dh-make-perl> will try to connect to bugs.debian.org to fetch the
appropriate bug number, using WWW::Mechanize.
=item B<--core-ok>
@@ -212,7 +212,7 @@ Allows building core Perl modules. By default, B<dh-make-perl> will not allow
building a module that is shipped as part of the standard Perl library; by
specifying this option, B<dh-make-perl> will build them anyway.
-Note that, although it is not probable, this might break unrelated items in
+Note that, although it is not probable, this might break unrelated items in
your system - if a newer version of a core module breaks the API, all kinds
of daemons might get upset ;-)
@@ -235,7 +235,7 @@ Contents cache file. If both are given, B<--home-dir> takes precedence.
=item B<--depends> I<DEPENDS>
-Manually specify the string to be used for the module's dependencies. This
+Manually specify the string to be used for the module's dependencies. This
should be used when building modules where B<dh-make-perl> cannot guess the Perl
dependencies (such as modules built using L<Module::Install>), or when the
Perl code depends on non-Perl binaries or libraries. Usually, B<dh-make-perl>
@@ -422,7 +422,7 @@ C/XS code.
=item * rules.Module-Build.noxs
-A debian/rules makefile for modules that use Module::Build, but don't have
+A debian/rules makefile for modules that use Module::Build, but don't have
C/XS code.
=item * rules.Module-Build.xs
diff --git a/lib/DhMakePerl/Command/Packaging.pm b/lib/DhMakePerl/Command/Packaging.pm
index e58668b..5ff13a7 100644
--- a/lib/DhMakePerl/Command/Packaging.pm
+++ b/lib/DhMakePerl/Command/Packaging.pm
@@ -592,7 +592,7 @@ sub extract_name_ver_from_makefile {
$vfrom = $4;
}
- elsif (
+ elsif (
$file =~ m{
\bversion\b\s* # The word version
\(?\s* # Optional open-parens
@@ -600,7 +600,7 @@ sub extract_name_ver_from_makefile {
([\d_.]+) # The actual version.
\1 # Optional close-quotes
\s*\)? # Optional close-parenthesis.
- }sx
+ }sx
) {
# Module::Install
@@ -1538,7 +1538,7 @@ sub discover_utility_deps {
# there are old packages that still build-depend on libmodule-build-perl
# or perl (>= 5.10) | libmodule-build-perl.
# Since M::B is part of perl 5.10, the build-dependency needs correction
- # and we replace this Build-Depends with simply perl, as lenny has the
+ # and we replace this Build-Depends with simply perl, as lenny has the
# required version.
# Remove perl from Build-Depends-Indep as then perl will be already in
# Build-Depends.
diff --git a/lib/DhMakePerl/Command/make.pm b/lib/DhMakePerl/Command/make.pm
index 26bccff..94a088a 100644
--- a/lib/DhMakePerl/Command/make.pm
+++ b/lib/DhMakePerl/Command/make.pm
@@ -238,7 +238,7 @@ sub execute {
$self->install_package if $self->cfg->install;
print "--- Done\n" if $self->cfg->verbose;
- $self->package_already_exists($apt_contents)
+ $self->package_already_exists($apt_contents)
or $self->modules_already_packaged($apt_contents);
return(0);
@@ -256,8 +256,8 @@ sub setup_dir {
$orig_pwd = $ENV{'PWD'};
# Is the module a core module?
- if ( is_core_module( $self->cfg->cpan ) ) {
- die $self->cfg->cpan
+ if ( is_core_module( $self->cfg->cpan ) ) {
+ die $self->cfg->cpan
. " is a standard module. Will not build without --core-ok.\n"
unless $self->cfg->core_ok;
}
@@ -320,7 +320,7 @@ sub setup_dir {
elsif ( $self->cfg->cpanplus ) {
die "CPANPLUS support is b0rken at the moment.";
- # my ($cb, $href, $file);
+# my ($cb, $href, $file);
# eval "use CPANPLUS 0.045;";
# $cb = CPANPLUS::Backend->new(conf => {debug => 1, verbose => 1});
@@ -350,7 +350,7 @@ sub build_package {
# uhmf! dpkg-genchanges doesn't cope with the deb being in another dir..
#system("dpkg-buildpackage -b -us -uc " . $self->cfg->dbflags) == 0
system("fakeroot make -C $main_dir -f debian/rules clean");
- system("make -C $main_dir -f debian/rules build") == 0
+ system("make -C $main_dir -f debian/rules build") == 0
|| die "Cannot create deb package: 'debian/rules build' failed.\n";
system("fakeroot make -C $main_dir -f debian/rules binary") == 0
|| die "Cannot create deb package: 'fakeroot debian/rules binary' failed.\n";
diff --git a/lib/DhMakePerl/Config.pm b/lib/DhMakePerl/Config.pm
index 535845a..7cb3853 100644
--- a/lib/DhMakePerl/Config.pm
+++ b/lib/DhMakePerl/Config.pm
@@ -129,7 +129,7 @@ sub parse_command_line_options {
$opts{cpan} =~ s![/-]!::!g if $opts{cpan};
# "If no argument is given (but the switch is specified - not specifying
- # the switch will include everything), it defaults to dpkg-source's
+ # the switch will include everything), it defaults to dpkg-source's
# default values."
$opts{exclude} = '^$' if ! defined $opts{exclude}; # switch not specified
# take everything
--
Debian packaging of dh-make-perl
More information about the Pkg-perl-cvs-commits
mailing list