[SCM] branch, master, updated. debian/0.9.9+git2012426-3-18-ge14bb4e
Danai SAE-HAN (=?UTF-8?Q?=E9=9F=93=E9=81=94=E8=80=90?=)
danai at debian.org
Sat Jul 6 19:02:35 UTC 2013
The following commit has been merged in the master branch:
commit 2cf2f599c3f1328b36495b312571fe960674c304
Author: Danai SAE-HAN (韓達耐) <danai at debian.org>
Date: Sun Jul 7 02:42:36 2013 +0800
Refresh patch debian/patches/01_remove_dependency_mozilla_ca.patch
diff --git a/debian/changelog b/debian/changelog
index e58b7bb..1cbf91f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-biber (1.5-1) UNRELEASED; urgency=low
+biber (1.7-1) UNRELEASED; urgency=low
[ gregor herrmann ]
* debian/control: update {versioned,alternative} (build) dependencies.
@@ -7,7 +7,7 @@ biber (1.5-1) UNRELEASED; urgency=low
* Update debian/watch
[ Danai SAE-HAN (韓達耐) ]
- * New upstream release 1.5:
+ * New upstream release 1.7:
- There are a lot of changes and updates since the last Debian
package (v0.9.9). I thoroughly recommend to have a look at
the upstream changelog which you can find under
@@ -23,12 +23,16 @@ biber (1.5-1) UNRELEASED; urgency=low
+ Sorting per list enabled for biblatex v2.0.
* [debian/gbp.conf] Use "upstream" as the upstream branch instead
of "upstream/dev".
- * [debian/control] Update the dependencies.
+ * [debian/control]
+ + Update the dependencies.
+ + Bump dependency to Perl 5.16+;
+ * [debian/patches/01_remove_dependency_mozilla_ca.patch]
+ + Refresh the patch.
[ Axel Beckert ]
* Fix Vcs-Browser header (Closes: #710246)
- -- Danai SAE-HAN (韓達耐) <danai at danai.kalimero> Mon, 04 Feb 2013 09:26:17 +0800
+ -- Danai SAE-HAN (韓達耐) <danai at debian.org> Sun, 07 Jul 2013 02:40:01 +0800
biber (0.9.9+git2012426-3) unstable; urgency=low
diff --git a/debian/patches/01_remove_dependency_mozilla_ca.patch b/debian/patches/01_remove_dependency_mozilla_ca.patch
index 5b34f50..d59518e 100644
--- a/debian/patches/01_remove_dependency_mozilla_ca.patch
+++ b/debian/patches/01_remove_dependency_mozilla_ca.patch
@@ -7,76 +7,76 @@ Last-Update: 2012-06-05
--- 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
+@@ -123,11 +123,7 @@ sub extract_entries {
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
+ not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- 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';
++ $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
+--- a/lib/Biber/Input/file/endnotexml.pm
++++ b/lib/Biber/Input/file/endnotexml.pm
+@@ -138,11 +138,7 @@ sub extract_entries {
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
+ not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- 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';
++ $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
+--- a/lib/Biber/Input/file/ris.pm
++++ b/lib/Biber/Input/file/ris.pm
+@@ -133,11 +133,7 @@ sub extract_entries {
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
+ not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- 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';
++ $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
+--- a/lib/Biber/Input/file/zoterordfxml.pm
++++ b/lib/Biber/Input/file/zoterordfxml.pm
+@@ -149,11 +149,7 @@ sub extract_entries {
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
+ not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- 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';
++ $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
+--- a/lib/Biber/Input/file/bibtex.pm
++++ b/lib/Biber/Input/file/bibtex.pm
+@@ -160,11 +160,7 @@ sub extract_entries {
# can't find the .pem when PAR::Packer'ed
- if (not exists($ENV{PERL_LWP_SSL_CA_FILE})) {
+ if (not exists($ENV{PERL_LWP_SSL_CA_FILE}) and
+ not defined(Biber::Config->getoption('ssl-nointernalca'))) {
- 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';
++ $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;
--
More information about the Pkg-perl-cvs-commits
mailing list