[licensecheck] 01/02: Fix patch and adapt build to install library-part as private library, to be multiarch-friendly. Closes: Bug#854233. Thanks to Johannes Schauer and Helmuth Grohne.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository licensecheck.

commit aa0cb4adb6e2c6f0e932ae1d26d910eb39190c1e
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Sep 17 22:08:31 2017 +0200

    Fix patch and adapt build to install library-part as private library, to be multiarch-friendly. Closes: Bug#854233. Thanks to Johannes Schauer and Helmuth Grohne.
---
 debian/control.in                            |  1 +
 debian/patches/2001_use_private_module.patch | 21 +++++++++++++++++++++
 debian/patches/README                        |  3 +++
 debian/patches/series                        |  1 +
 debian/rules                                 |  3 +++
 5 files changed, 29 insertions(+)

diff --git a/debian/control.in b/debian/control.in
index 6135298..9a96d85 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -17,6 +17,7 @@ Depends: ${cdbs:Depends},
 Suggests: ${cdbs:Suggests}
 Breaks: devscripts (<< 2.16.6~)
 Replaces: devscripts (<< 2.16.6~)
+Multi-Arch: foreign
 Description: simple license checker for source files
  Licensecheck attempts to determine the license that applies to each
  file passed to it, by searching the start of the file for text
diff --git a/debian/patches/2001_use_private_module.patch b/debian/patches/2001_use_private_module.patch
new file mode 100644
index 0000000..d5e652e
--- /dev/null
+++ b/debian/patches/2001_use_private_module.patch
@@ -0,0 +1,21 @@
+Description: use private licensecheck module
+ For the licensecheck binary package to be Multi-Arch foreign, the perl
+ module parts have to be hidden from the world and must thus not be
+ installed into the common perl search path. If the module part of
+ licensecheck is ever needed by another module, then the module would
+ have to be moved to a new binary package and marked as Architecture:any
+ Multi-Arch:same to avoid the multiarch interpreter problem.
+Author: Johannes Schauer <josch at debian.org>
+Last-Update: 2017-02-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/bin/licensecheck
++++ b/bin/licensecheck
+@@ -17,6 +17,7 @@
+ use List::Util 1.45 qw(uniq uniqstr);
+ use Sort::Key::Multi 1.25 qw(rs_keysort rus_keysort);
+ 
++use lib '/usr/share/licensecheck';
+ use App::Licensecheck;
+ 
+ =head1 NAME
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..aca1830
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_use_private_module.patch
diff --git a/debian/rules b/debian/rules
index f653bd3..3ef8e4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,5 +41,8 @@ CDBS_BUILD_DEPENDS +=, $(bdeps), $(deps), $(deps-suggest), $(deps-test), $(deps-
 CDBS_DEPENDS_$(pkg) = $(deps)
 CDBS_SUGGESTS_$(pkg) = $(deps-suggest)
 
+# Install as private library, to be multiarch-friendly.
+DEB_MAKEMAKER_USER_FLAGS=LIB=/usr/share/licensecheck
+
 binary-install/licensecheck::
 	dh_bash-completion -p$(cdbs_curpkg)

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