[libgnupg-perl] 01/07: Use gpg1 explicitly while incompatible with GnuPG 2.1.x (closes: #834522)

[Florian Schlichting]

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

fsfs pushed a commit to branch master
in repository libgnupg-perl.

commit c6204b9dae930039eee21cba5fa42ec7caedb2b4
Author: Florian Schlichting <fsfs at debian.org>
Date:   Thu Dec 22 22:48:48 2016 +0100

    Use gpg1 explicitly while incompatible with GnuPG 2.1.x (closes: #834522)
---
 debian/control                |  4 ++--
 debian/patches/series         |  1 +
 debian/patches/use_gpg1.patch | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 701c234..28d5292 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Section: perl
 Testsuite: autopkgtest-pkg-perl
 Priority: optional
 Build-Depends: debhelper (>= 8)
-Build-Depends-Indep: gnupg,
+Build-Depends-Indep: gnupg1,
                      perl
 Standards-Version: 3.9.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-perl/packages/libgnupg-perl.git
@@ -18,7 +18,7 @@ Package: libgnupg-perl
 Architecture: all
 Depends: ${misc:Depends},
          ${perl:Depends},
-         gnupg
+         gnupg1
 Description: interface to GnuPG using its coprocess interface
  GnuPG is a Perl module that provides a limited programmatic interface to the
  GNU Privacy Guard program. It uses the coprocess hook system provided by gpg
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..468afc5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_gpg1.patch
diff --git a/debian/patches/use_gpg1.patch b/debian/patches/use_gpg1.patch
new file mode 100644
index 0000000..fa71d92
--- /dev/null
+++ b/debian/patches/use_gpg1.patch
@@ -0,0 +1,20 @@
+Description: use gpg1 explicitly, package is not compatible with GnuPG 2.1.x
+Author: Florian Schlichting <fsfs at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=834522
+
+--- a/GnuPG.pm
++++ b/GnuPG.pm
+@@ -366,10 +366,10 @@
+       unless -x $args{gnupg_path};
+     $self->{gnupg_path} = $args{gnupg_path};
+     } else {
+-    my ($path) = grep { -x "$_/gpg" } split /:/, $ENV{PATH};
+-    croak ( "Couldn't find gpg in PATH ($ENV{PATH})\n" )
++    my ($path) = grep { -x "$_/gpg1" } split /:/, $ENV{PATH};
++    croak ( "Couldn't find gpg1 in PATH ($ENV{PATH})\n" )
+       unless $path;
+-    $self->{gnupg_path} = "$path/gpg";
++    $self->{gnupg_path} = "$path/gpg1";
+     }
+     $self->{trace} = $args{trace} ? 1 : 0;
+ 

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