Control: tag -1 patch
On Sun, Sep 04, 2016 at 11:17:50AM +0300, Niko Tyni wrote:
> However, while building with --add-depends=sbuild fixes (most?) of
> the gnupg issues, we also have new failures - probably related to perl
> removing cwd from @INC in 5.22.2-4 (which happened after the 4.2.13-1
> upload.)
It builds for me with these patches. Not pushed to git because alioth
seems to be down. Eyeballs would be good for the RT::I18N change (the
others are trivial.)
--
Niko
>From 9251965c2ee5f9e23a9b196aad97fe404343b386 Mon Sep 17 00:00:00 2001
From: Niko Tyni <nt...@debian.org>
Date: Sun, 4 Sep 2016 11:41:29 +0300
Subject: [PATCH] Fix RT::I18N and the test suite to work without cwd in @INC
---
lib/RT/I18N.pm | 5 +++--
t/lifecycles/basics.t | 2 +-
t/lifecycles/dates.t | 2 +-
t/lifecycles/moving.t | 2 +-
t/lifecycles/types.t | 2 +-
t/lifecycles/unresolved-deps.t | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/RT/I18N.pm b/lib/RT/I18N.pm
index 60a6622..1bf0b57 100644
--- a/lib/RT/I18N.pm
+++ b/lib/RT/I18N.pm
@@ -56,6 +56,7 @@ package RT::I18N;
use strict;
use warnings;
+use Cwd ();
use Locale::Maketext 1.04;
@@ -97,10 +98,10 @@ sub Init {
@lang = ('*') unless @lang;
# load default functions
- require substr(__FILE__, 0, -3) . '/i_default.pm';
+ require substr(Cwd::abs_path(__FILE__), 0, -3) . '/i_default.pm';
# Load language-specific functions
- foreach my $file ( File::Glob::bsd_glob(substr(__FILE__, 0, -3) . "/*.pm") ) {
+ foreach my $file ( File::Glob::bsd_glob(substr(Cwd::abs_path(__FILE__), 0, -3) . "/*.pm") ) {
my ($lang) = ($file =~ /([^\\\/]+?)\.pm$/);
next unless grep $_ eq '*' || $_ eq $lang, @lang;
require $file;
diff --git a/t/lifecycles/basics.t b/t/lifecycles/basics.t
index e18bea3..85e77c7 100644
--- a/t/lifecycles/basics.t
+++ b/t/lifecycles/basics.t
@@ -1,7 +1,7 @@
use strict;
use warnings;
-BEGIN {require 't/lifecycles/utils.pl'};
+BEGIN {require './t/lifecycles/utils.pl'};
my $general = RT::Test->load_or_create_queue(
Name => 'General',
diff --git a/t/lifecycles/dates.t b/t/lifecycles/dates.t
index 0c74a1b..a8dd8cf 100644
--- a/t/lifecycles/dates.t
+++ b/t/lifecycles/dates.t
@@ -1,7 +1,7 @@
use strict;
use warnings;
-BEGIN {require 't/lifecycles/utils.pl'};
+BEGIN {require './t/lifecycles/utils.pl'};
my $general = RT::Test->load_or_create_queue(
Name => 'General',
diff --git a/t/lifecycles/moving.t b/t/lifecycles/moving.t
index 8a03e3e..379b646 100644
--- a/t/lifecycles/moving.t
+++ b/t/lifecycles/moving.t
@@ -1,7 +1,7 @@
use strict;
use warnings;
-BEGIN {require 't/lifecycles/utils.pl'};
+BEGIN {require './t/lifecycles/utils.pl'};
my $general = RT::Test->load_or_create_queue(
Name => 'General',
diff --git a/t/lifecycles/types.t b/t/lifecycles/types.t
index 79b0714..84cfd86 100644
--- a/t/lifecycles/types.t
+++ b/t/lifecycles/types.t
@@ -1,7 +1,7 @@
use strict;
use warnings;
-BEGIN {require 't/lifecycles/utils.pl'};
+BEGIN {require './t/lifecycles/utils.pl'};
is_deeply( [ RT::Lifecycle->ListAll ], [qw/ approvals default delivery /],
"Get the list of all lifecycles (implicitly for for tickets)");
diff --git a/t/lifecycles/unresolved-deps.t b/t/lifecycles/unresolved-deps.t
index 5da4b8f..fe09d3b 100644
--- a/t/lifecycles/unresolved-deps.t
+++ b/t/lifecycles/unresolved-deps.t
@@ -1,7 +1,7 @@
use strict;
use warnings;
-BEGIN {require 't/lifecycles/utils.pl'};
+BEGIN {require './t/lifecycles/utils.pl'};
my $general = RT::Test->load_or_create_queue(
Name => 'General',
--
2.9.3
>From f74fc8c683c822e4f9afdaa9308e751dbc753a94 Mon Sep 17 00:00:00 2001
From: Niko Tyni <nt...@debian.org>
Date: Sun, 4 Sep 2016 11:37:57 +0300
Subject: [PATCH] Build-depend on gnupg instead of gnupg1
---
debian/control | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index 88c75a4..7291280 100644
--- a/debian/control
+++ b/debian/control
@@ -106,7 +106,7 @@ Build-Depends: debhelper (>= 5),
libdbd-mysql-perl,
dh-autoreconf,
dh-systemd,
- gnupg1,
+ gnupg,
Build-Depends-Indep: perl (>= 5.8.3)
Standards-Version: 3.9.8
Vcs-Git: git://anonscm.debian.org/pkg-request-tracker/request-tracker4.git
--
2.9.3
