This is an automated email from the git hooks/post-receive script. fsfs pushed a commit to branch master in repository libmodule-build-perl.
commit ebce330b99c5690c0d3f1d862ef367fe7e4f4420 Author: Florian Schlichting <f...@debian.org> Date: Thu Sep 10 13:19:50 2015 +0200 Convert patch management to git-debcherry This is a bold move! But with two patches not destined for upstream, and active development, this is the perfect example. Kick me if debcherry gets in your way! --- debian/README.source | 19 +++++++++++++++++++ ...ding-from-system-path-when-running-under-au.patch | 7 ++----- ...0002-Sort-file-lists-generated-by-rscan_dir.patch | 7 ++----- debian/patches/man-ext | 20 ++++++++++++++------ debian/patches/series | 1 + 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..31af40a --- /dev/null +++ b/debian/README.source @@ -0,0 +1,19 @@ +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-appled 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/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 470a119..d318837 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,4 +1,3 @@ -From 5a72ba915915cc44d7651f185fc2f0a3e7acfecd Mon Sep 17 00:00:00 2001 From: Niko Tyni <nt...@debian.org> Date: Fri, 19 Sep 2014 00:00:51 +0300 Subject: [PATCH] Allow loading from system path when running under autopkgtest @@ -13,12 +12,13 @@ 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 -index fda7f69..86c6d1f 100644 --- a/t/lib/MBTest.pm +++ b/t/lib/MBTest.pm @@ -220,7 +220,7 @@ sub find_in_path { @@ -39,6 +39,3 @@ index fda7f69..86c6d1f 100644 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 ", --- -2.1.0 - diff --git a/debian/patches/0002-Sort-file-lists-generated-by-rscan_dir.patch b/debian/patches/0002-Sort-file-lists-generated-by-rscan_dir.patch index bcb1826..a7e3b6d 100644 --- a/debian/patches/0002-Sort-file-lists-generated-by-rscan_dir.patch +++ b/debian/patches/0002-Sort-file-lists-generated-by-rscan_dir.patch @@ -1,4 +1,3 @@ -From 7bfcb26d8e314bce37aeeef4048f99b66fcdfbbc Mon Sep 17 00:00:00 2001 From: Niko Tyni <nt...@debian.org> Date: Tue, 1 Sep 2015 22:05:27 +0300 Subject: [PATCH] Sort file lists generated by rscan_dir() @@ -13,12 +12,13 @@ The linking order affects the generated binary, essentially rendering it nondeterministic and breaking reproducibility. Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=106813 +Patch-Name: 0002-Sort-file-lists-generated-by-rscan_dir.patch --- + lib/Module/Build/Base.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Module/Build/Base.pm b/lib/Module/Build/Base.pm -index 1cbc61e..d9ea82f 100644 --- a/lib/Module/Build/Base.pm +++ b/lib/Module/Build/Base.pm @@ -5255,7 +5255,7 @@ sub rscan_dir { @@ -30,6 +30,3 @@ index 1cbc61e..d9ea82f 100644 } sub delete_filetree { --- -2.1.4 - diff --git a/debian/patches/man-ext b/debian/patches/man-ext index 036aa86..217d64c 100644 --- a/debian/patches/man-ext +++ b/debian/patches/man-ext @@ -1,12 +1,20 @@ -Subject: Fix manual page extensions for Debian. -Author: Niko Tyni <nt...@debian.org> +From: Niko Tyni <nt...@debian.org> +Date: Thu, 21 Aug 2014 13:17:20 +0200 +Subject: [PATCH] Fix manual page extensions for Debian. + + Forwarded: not-needed -Reviewed-by: Florian Schlichting <f...@debian.org> -Last-Update: 2014-08-21 +Reviewed-by: Florian Schlichting <f...@debian.org> +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 -@@ -3212,7 +3212,7 @@ +@@ -3212,7 +3212,7 @@ sub ACTION_manpages { sub manify_bin_pods { my $self = shift; @@ -15,7 +23,7 @@ Last-Update: 2014-08-21 my $files = $self->_find_pods( $self->{properties}{bindoc_dirs}, exclude => [ $self->file_qr('\.bat$') ] ); -@@ -3239,7 +3239,7 @@ +@@ -3239,7 +3239,7 @@ sub manify_bin_pods { sub manify_lib_pods { my $self = shift; diff --git a/debian/patches/series b/debian/patches/series index 2ee1ac1..01dacf7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +# exported from git by git-debcherry man-ext 0001-Allow-loading-from-system-path-when-running-under-au.patch 0002-Sort-file-lists-generated-by-rscan_dir.patch -- 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 Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits