[cpanminus] 07/12: Update build machinery to new tarball source and avoid any fatpacking.

Sat Dec 9 18:54:51 UTC 2017

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository cpanminus.

commit d7e7c1967be57ec7e9796f268a8a6742aefa9d0c
Author: gregor herrmann <gregoa at debian.org>
Date:   Sat Dec 9 19:40:38 2017 +0100

    Update build machinery to new tarball source and avoid any fatpacking.
    
    - run (patched) maint/build.pl in debian/rules instead of removing fatpacked
      modules after the fact
    - update build dependencies
    - remove generated files via debian/clean
    - update debian/patches/test-load.patch (new modules)
    
    Closes: #851506
---
 debian/clean                   |  4 ++++
 debian/control                 | 19 ++++++++++++++++--
 debian/patches/fatpack.patch   | 19 ++++++++++++++++++
 debian/patches/series          |  1 +
 debian/patches/test-load.patch |  2 +-
 debian/rules                   | 45 ++++++------------------------------------
 6 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..e91875c
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,4 @@
+cpanm
+bin/cpanm
+fatpacked/App/cpanminus/fatscript.pm
+lib/App/cpanminus/fatscript.pm
diff --git a/debian/control b/debian/control
index c3bd013..e45bb07 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,23 @@ Section: perl
 Testsuite: autopkgtest-pkg-perl
 Priority: optional
 Build-Depends: debhelper (>= 9)
-Build-Depends-Indep: perl,
-                     libstring-shellquote-perl
+Build-Depends-Indep: libcpan-distnameinfo-perl,
+                     libcpan-meta-check-perl (>= 0.012),
+                     libfile-pushd-perl (>= 1.009),
+                     liblocal-lib-perl (>= 2.000015),
+                     libmodule-cpanfile-perl (>= 1.1000),
+                     libparse-pmfile-perl (>= 0.36),
+                     libstring-shellquote-perl,
+# Exporter 5.70, parent 0.228
+                     perl (>= 5.19.4),
+                     perl (>= 5.19.10) | libparse-cpan-meta-perl (>= 1.4414),
+                     perl (>= 5.21.5) | libjson-pp-perl (>= 2.27300),
+                     perl (>= 5.23.0) | libcpan-meta-perl (>= 2.150005),
+                     perl (>= 5.23.0) | libcpan-meta-requirements-perl (>= 2.133),
+                     perl (>= 5.23.0) | libcpan-meta-yaml-perl (>= 0.016),
+                     perl (>= 5.23.0) | libhttp-tiny-perl (>= 0.056) | curl | wget,
+                     perl (>= 5.23.0) | libmodule-metadata-perl (>= 1.000027),
+                     perl (>= 5.23.9) | libversion-perl (>= 1:0.9912)
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/cpanminus.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-perl/packages/cpanminus.git
diff --git a/debian/patches/fatpack.patch b/debian/patches/fatpack.patch
new file mode 100644
index 0000000..8b8fe1d
--- /dev/null
+++ b/debian/patches/fatpack.patch
@@ -0,0 +1,19 @@
+Description: don't fatpack anything
+Origin: vendor
+Forwarded: not-needed
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2017-12-09
+
+--- a/maint/build.pl
++++ b/maint/build.pl
+@@ -55,8 +55,8 @@
+     `fatpack file`;
+ };
+ 
+-generate_file('script/cpanm.PL', "cpanm", $fatpack_compact);
+-generate_file('script/cpanm.PL', "fatpacked/App/cpanminus/fatscript.pm", $fatpack, 'package App::cpanminus::fatscript;');
++generate_file('script/cpanm.PL', "cpanm", '');
++generate_file('script/cpanm.PL', "fatpacked/App/cpanminus/fatscript.pm", '', 'package App::cpanminus::fatscript;');
+ chmod 0755, "cpanm";
+ 
+ END {
diff --git a/debian/patches/series b/debian/patches/series
index b5164c2..616b9f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fatpack.patch
 test-load.patch
diff --git a/debian/patches/test-load.patch b/debian/patches/test-load.patch
index 7f0cb5f..d6b7249 100644
--- a/debian/patches/test-load.patch
+++ b/debian/patches/test-load.patch
@@ -11,6 +11,6 @@ Last-Update: 2017-01-13
 +
 +use Test::More;
 +
-+my @modules = ( 'App::cpanminus', 'App::cpanminus::fatscript' );
++my @modules = ( 'App::cpanminus', 'App::cpanminus::fatscript', 'App::cpanminus', 'App::cpanminus::script', 'App::cpanminus::Dependency' );
 +plan tests => scalar @modules;
 +use_ok($_) foreach @modules;
diff --git a/debian/rules b/debian/rules
index e23e0ee..b72b265 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 BUILDHOME = $(CURDIR)/debian/build
+FAT = $(CURDIR)/fatpacked/App/cpanminus/fatscript.pm
 
 %:
 	dh $@
@@ -9,45 +10,11 @@ override_dh_clean:
 	dh_clean
 	rm -rf $(BUILDHOME)
 
-override_dh_auto_build:
-	dh_auto_build
-	for FAT in \
-		APP_CPANMINUS		\
-		CPAN_DISTNAMEINFO	\
-		CPAN_META		\
-		CPAN_META_CHECK		\
-		CPAN_META_CONVERTER	\
-		CPAN_META_FEATURE	\
-		CPAN_META_HISTORY	\
-		CPAN_META_MERGE		\
-		CPAN_META_PREREQS	\
-		CPAN_META_REQUIREMENTS	\
-		CPAN_META_SPEC		\
-		CPAN_META_VALIDATOR	\
-		CPAN_META_YAML		\
-		EXPORTER		\
-		EXPORTER_HEAVY		\
-		FILE_PUSHD		\
-		HTTP_TINY		\
-		JSON_PP			\
-		JSON_PP_BOOLEAN		\
-		LIB_CORE_ONLY		\
-		LOCAL_LIB		\
-		MODULE_CPANFILE		\
-		MODULE_CPANFILE_ENVIRONMENT \
-		MODULE_CPANFILE_PREREQS	\
-		MODULE_CPANFILE_REQUIREMENT	\
-		MODULE_METADATA		\
-		PARENT			\
-		PARSE_CPAN_META		\
-		PARSE_PMFILE		\
-		STRING_SHELLQUOTE	\
-		VERSION			\
-		VERSION_REGEX		\
-		VERSION_VPP		\
-	; do \
-		sed -i -e "/<<'$$FAT'/,/^$$FAT/ d" $(CURDIR)/blib/script/cpanm $(CURDIR)/blib/lib/App/cpanminus/fatscript.pm ; \
-	done
+override_dh_auto_configure:
+	perl $(CURDIR)/maint/build.pl
+	# App::cpanminus::fatscript is used by carton, so let's install it
+	[ ! -f $(FAT) ] || cp -v $(FAT) $(CURDIR)/lib/App/cpanminus
+	dh_auto_configure
 
 override_dh_auto_test:
 	mkdir -p $(BUILDHOME)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/cpanminus.git

