This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libmodule-build-perl.
commit d3ba31d2bc495545a8ab3cbb3f3f090372acd4c7 Author: gregor herrmann <[email protected]> Date: Fri Sep 22 19:55:53 2017 +0200 Drop git-debcherry framework as per decision of the pkg-perl BoF at DebConf17. Unapply patches, update patch headers, remove git notes, remove debian/README.source and debian/gbp.conf. --- debian/README.source | 19 ------------------- debian/gbp.conf | 3 --- ...ading-from-system-path-when-running-under-au.patch | 9 +-------- debian/patches/man-ext | 8 -------- lib/Module/Build/Base.pm | 4 ++-- t/lib/MBTest.pm | 4 ++-- 6 files changed, 5 insertions(+), 42 deletions(-) diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index ffb2406..0000000 --- a/debian/README.source +++ /dev/null @@ -1,19 +0,0 @@ -git-debcherry in use -==================== - -If you are reading this from a Debian source package, you can stop now; -this package should build normally after extracting with dpkg-source -x. - -If you are working in a checkout of the package's git repo, you should -also be able to just ignore debcherry and work on patches with quilt, -with the difference that the master branch is patches-applied. You are -however invited to take a look at git-debcherry and let it handle the -debian/patches directory automatically. - -If you so wish, the following command will set up quilt to work with -patches-applied in this repository: - - for patch in `quilt series | tac`; \ - do patch -p1 -R --no-backup-if-mismatch <"debian/patches/$patch"; done; \ - quilt push -a - diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 6c88b1f..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,3 +0,0 @@ -[import-orig] -merge-mode=merge -rollback=False diff --git a/debian/patches/0001-Allow-loading-from-system-path-when-running-under-au.patch b/debian/patches/0001-Allow-loading-from-system-path-when-running-under-au.patch index 2b1c8d1..68b0c70 100644 --- a/debian/patches/0001-Allow-loading-from-system-path-when-running-under-au.patch +++ b/debian/patches/0001-Allow-loading-from-system-path-when-running-under-au.patch @@ -1,6 +1,7 @@ From: Niko Tyni <[email protected]> Date: Fri, 19 Sep 2014 00:00:51 +0300 Subject: [PATCH] Allow loading from system path when running under autopkgtest +Forwarded: not-needed When re-using the build time test suite as a runtime as-installed one, we explicitly want to load Module::Build from the system paths. This @@ -11,14 +12,6 @@ Rewiring check_compiler() to return early is to avoid a call to M::B->current(), which needs a 'build_params' file remaining from its own build. -Forwarded: not-needed -Patch-Name: 0001-Allow-loading-from-system-path-when-running-under-au.patch ---- - - t/lib/MBTest.pm | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/t/lib/MBTest.pm b/t/lib/MBTest.pm --- a/t/lib/MBTest.pm +++ b/t/lib/MBTest.pm @@ -221,7 +221,7 @@ sub find_in_path { diff --git a/debian/patches/man-ext b/debian/patches/man-ext index 15fc4f6..b49b018 100644 --- a/debian/patches/man-ext +++ b/debian/patches/man-ext @@ -1,17 +1,9 @@ From: Niko Tyni <[email protected]> Date: Thu, 21 Aug 2014 13:17:20 +0200 Subject: [PATCH] Fix manual page extensions for Debian. - - Forwarded: not-needed Reviewed-by: Florian Schlichting <[email protected]> -Patch-Name: man-ext ---- - - lib/Module/Build/Base.pm | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm --- a/lib/Module/Build/Base.pm +++ b/lib/Module/Build/Base.pm @@ -3218,7 +3218,7 @@ sub ACTION_manpages { diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm index ae6919b..984810a 100644 --- a/lib/Module/Build/Base.pm +++ b/lib/Module/Build/Base.pm @@ -3218,7 +3218,7 @@ sub ACTION_manpages { sub manify_bin_pods { my $self = shift; - my %podman_args = (section => '1p', @_); # binaries go in section 1 + my %podman_args = (section => 1, @_); # binaries go in section 1 my $files = $self->_find_pods( $self->{properties}{bindoc_dirs}, exclude => [ $self->file_qr('\.bat$') ] ); @@ -3245,7 +3245,7 @@ sub manify_bin_pods { sub manify_lib_pods { my $self = shift; - my %podman_args = (section => '3pm', @_); # libraries go in section 3 + my %podman_args = (section => 3, @_); # libraries go in section 3 my $files = $self->_find_pods($self->{properties}{libdoc_dirs}); return unless keys %$files; diff --git a/t/lib/MBTest.pm b/t/lib/MBTest.pm index 5c44f8f..2aeda20 100644 --- a/t/lib/MBTest.pm +++ b/t/lib/MBTest.pm @@ -221,7 +221,7 @@ sub find_in_path { } sub check_compiler { - if ($ENV{PERL_CORE} || $ENV{ADTTMP}) { + if ($ENV{PERL_CORE}) { require IPC::Cmd; if ( $Config{usecrosscompile} && !IPC::Cmd::can_run($Config{cc}) ) { return; @@ -272,7 +272,7 @@ sub blib_load { (my $path = $mod) =~ s{::}{/}g; $path .= ".pm"; my ($pkg, $file, $line) = caller; - unless($ENV{PERL_CORE} || $ENV{ADTTMP}) { + unless($ENV{PERL_CORE}) { unless($INC{$path} =~ m/\bblib\b/) { (my $load_from = $INC{$path}) =~ s{$path$}{}; die "$mod loaded from '$load_from'\nIt should have been loaded from blib. \@INC contains:\n ", -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libmodule-build-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
