[SCM] branch, master, updated. upstream/0.9.9+git2012426-13-g8b9aac2
Danai SAE-HAN (=?UTF-8?Q?=E9=9F=93=E9=81=94=E8=80=90?=)
danai at debian.org
Tue May 1 10:46:03 UTC 2012
The following commit has been merged in the master branch:
commit c36d3a4a7d206f25e9682e862075e86d930b35a9
Author: Danai SAE-HAN (韓達耐) <danai at debian.org>
Date: Tue May 1 12:41:35 2012 +0200
Add a quilt patch to remove the dependency on Mozilla::CA and make
use of `ca-certificates'; change the build-dependency and depency
accordingly. Also change the dependency on `liblwp-simple-perl' to
`libwww-perl'.
diff --git a/debian/control b/debian/control
index 97d1e2f..c021d9a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,9 @@ Build-Depends: debhelper (>= 9),
perl,
libtest-pod-perl (>= 1.22),
libtest-pod-coverage-perl (>= 1.08),
- libmozilla-ca-perl (>= 20120309),
libconfig-autoconf-perl (>= 0.15),
libextutils-libbuilder-perl (>= 0.02),
- libmozilla-ca-perl (>= 20120309)
+ ca-certificates
Standards-Version: 3.9.3
Homepage: http://biblatex-biber.sourceforge.net/
Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/biber.git
@@ -19,7 +18,8 @@ Vcs-Browser: http://anonscm.debian.org/git/pkg-perl/packages/biber.git
Package: biber
Architecture: all
Recommends: libreadonly-xs-perl,
- biblatex
+ biblatex,
+ ca-certificates
Depends: ${misc:Depends},
${perl:Depends},
libdata-compare-perl,
@@ -38,8 +38,7 @@ Depends: ${misc:Depends},
libunicode-collate-perl (>= 0.89),
libxml-libxml-simple-perl,
libxml-libxslt-perl,
- libxml-writer-string-perl,
- libmozilla-ca-perl (>= 20120309)
+ libxml-writer-string-perl
Description: Much-augmented BibTeX replacement for BibLaTeX users
The biblatex package by Philipp Lehman is becoming the definitive
citation management tool for LaTeX users. Biblatex has relied on the
diff --git a/debian/patches/01_remove_dependency_mozilla_ca.patch b/debian/patches/01_remove_dependency_mozilla_ca.patch
new file mode 100644
index 0000000..94191bb
--- /dev/null
+++ b/debian/patches/01_remove_dependency_mozilla_ca.patch
@@ -0,0 +1,75 @@
+--- a/lib/Biber/Input/file/biblatexml.pm
++++ b/lib/Biber/Input/file/biblatexml.pm
+@@ -75,11 +75,7 @@
+ # We have to explicitly set the cert path because otherwise the https module
+ # can't find the .pem when PAR::Packer'ed
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
+- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
+- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
+- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
+- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
++ $ENV{PERL_LWP_SSL_CA_FILE} = '/etc/ssl/certs/ca-certificates.crt';
+ }
+ if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
+ $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
+--- a/lib/Biber/Input/file/bibtex.pm
++++ b/lib/Biber/Input/file/bibtex.pm
+@@ -100,11 +100,7 @@
+ # We have to explicitly set the cert path because otherwise the https module
+ # can't find the .pem when PAR::Packer'ed
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
+- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
+- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
+- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
+- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
++ $ENV{PERL_LWP_SSL_CA_FILE} = '/etc/ssl/certs/ca-certificates.crt';
+ }
+ if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
+ $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
+--- a/lib/Biber/Input/file/endnotexml.pm
++++ b/lib/Biber/Input/file/endnotexml.pm
+@@ -73,11 +73,7 @@
+ # We have to explicitly set the cert path because otherwise the https module
+ # can't find the .pem when PAR::Packer'ed
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
+- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
+- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
+- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
+- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
++ $ENV{PERL_LWP_SSL_CA_FILE} = '/etc/ssl/certs/ca-certificates.crt';
+ }
+ if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
+ $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
+--- a/lib/Biber/Input/file/ris.pm
++++ b/lib/Biber/Input/file/ris.pm
+@@ -69,11 +69,7 @@
+ # We have to explicitly set the cert path because otherwise the https module
+ # can't find the .pem when PAR::Packer'ed
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
+- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
+- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
+- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
+- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
++ $ENV{PERL_LWP_SSL_CA_FILE} = '/etc/ssl/certs/ca-certificates.crt';
+ }
+ if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
+ $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
+--- a/lib/Biber/Input/file/zoterordfxml.pm
++++ b/lib/Biber/Input/file/zoterordfxml.pm
+@@ -84,11 +84,7 @@
+ # We have to explicitly set the cert path because otherwise the https module
+ # can't find the .pem when PAR::Packer'ed
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+- require Mozilla::CA; # Have to explicitly require this here to get it into %INC below
+- # we assume that the default CA file is in .../Mozilla/CA/cacert.pem
+- (my $vol, my $dir, undef) = File::Spec->splitpath( $INC{"Mozilla/CA.pm"} );
+- $dir =~ s/\/$//; # splitpath sometimes leaves a trailing '/'
+- $ENV{PERL_LWP_SSL_CA_FILE} = File::Spec->catpath($vol, "$dir/CA", 'cacert.pem');
++ $ENV{PERL_LWP_SSL_CA_FILE} = '/etc/ssl/certs/ca-certificates.crt';
+ }
+ if (defined(Biber::Config->getoption('ssl-noverify-host'))) {
+ $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4c23592
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_remove_dependency_mozilla_ca.patch
--
More information about the Pkg-perl-cvs-commits
mailing list