[libtext-bibtex-perl] 04/07: Refresh a couple of other patches (offset).
gregor herrmann
gregoa at debian.org
Fri Jun 20 16:36:21 UTC 2014
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libtext-bibtex-perl.
commit 7d061f4c18fd4b5fcfb3431eff68f05c4ba73bbe
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Jun 20 17:58:49 2014 +0200
Refresh a couple of other patches (offset).
---
...-Introduce-a-btparse_api_version-note-and-use-it-in-d.patch | 10 +++-------
.../0004-disable-rpath-if-installing-into-usr-lib.patch | 4 +---
debian/patches/0005-no-ldconfig.patch | 4 ++--
debian/patches/0007-hardening-flags.patch | 2 +-
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/debian/patches/0003-Introduce-a-btparse_api_version-note-and-use-it-in-d.patch b/debian/patches/0003-Introduce-a-btparse_api_version-note-and-use-it-in-d.patch
index f48ee7b..bff28bd 100644
--- a/debian/patches/0003-Introduce-a-btparse_api_version-note-and-use-it-in-d.patch
+++ b/debian/patches/0003-Introduce-a-btparse_api_version-note-and-use-it-in-d.patch
@@ -19,8 +19,6 @@ Build.PL.
inc/MyBuilder.pm | 22 ++++++++++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)
-diff --git a/Build.PL b/Build.PL
-index 3abd5d9..2d5cd5a 100644
--- a/Build.PL
+++ b/Build.PL
@@ -86,6 +86,10 @@ if ($^O =~ /mswin32/i) {
@@ -34,8 +32,6 @@ index 3abd5d9..2d5cd5a 100644
$builder->notes('lib_path' => $libdir);
$builder->add_build_element('usrlib');
$builder->install_path( 'usrlib' => $libdir );
-diff --git a/inc/MyBuilder.pm b/inc/MyBuilder.pm
-index 845dc43..0cfc587 100644
--- a/inc/MyBuilder.pm
+++ b/inc/MyBuilder.pm
@@ -15,6 +15,7 @@ use ExtUtils::Mkbootstrap;
@@ -46,7 +42,7 @@ index 845dc43..0cfc587 100644
sub ACTION_install {
my $self = shift;
-@@ -296,9 +297,14 @@ sub ACTION_create_library {
+@@ -297,9 +298,14 @@ sub ACTION_create_library {
my $libbuilder = $self->notes('libbuilder');
@@ -62,7 +58,7 @@ index 845dc43..0cfc587 100644
my @modules = qw:init input bibtex err scan error
lex_auxiliary parse_auxiliary bibtex_ast sym
-@@ -308,14 +314,14 @@ sub ACTION_create_library {
+@@ -309,14 +315,14 @@ sub ACTION_create_library {
my @objects = map { "btparse/src/$_.o" } @modules;
my $libpath = $self->notes('lib_path');
@@ -80,7 +76,7 @@ index 845dc43..0cfc587 100644
}
if (!$self->up_to_date(\@objects, $libfile)) {
-@@ -325,6 +331,14 @@ sub ACTION_create_library {
+@@ -326,6 +332,14 @@ sub ACTION_create_library {
extra_linker_flags => $extra_linker_flags);
}
diff --git a/debian/patches/0004-disable-rpath-if-installing-into-usr-lib.patch b/debian/patches/0004-disable-rpath-if-installing-into-usr-lib.patch
index edab189..ea70492 100644
--- a/debian/patches/0004-disable-rpath-if-installing-into-usr-lib.patch
+++ b/debian/patches/0004-disable-rpath-if-installing-into-usr-lib.patch
@@ -9,11 +9,9 @@ libraries in the files system.
inc/MyBuilder.pm | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
-diff --git a/inc/MyBuilder.pm b/inc/MyBuilder.pm
-index 0cfc587..4881005 100644
--- a/inc/MyBuilder.pm
+++ b/inc/MyBuilder.pm
-@@ -184,8 +184,14 @@ sub ACTION_create_binaries {
+@@ -185,8 +185,14 @@ sub ACTION_create_binaries {
print STDERR "\n** Creating binaries (dumpnames$EXEEXT, biblex$EXEEXT, bibparse$EXEEXT)\n";
diff --git a/debian/patches/0005-no-ldconfig.patch b/debian/patches/0005-no-ldconfig.patch
index e7f4bc3..56fa3f9 100644
--- a/debian/patches/0005-no-ldconfig.patch
+++ b/debian/patches/0005-no-ldconfig.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-03-04
--- a/inc/MyBuilder.pm
+++ b/inc/MyBuilder.pm
-@@ -30,10 +30,10 @@
+@@ -30,10 +30,10 @@ sub ACTION_install {
$self->install_path( 'usrlib' => $usrlib );
}
$self->SUPER::ACTION_install;
@@ -18,6 +18,6 @@ Last-Update: 2012-03-04
+# my $linux = Config::AutoConf->check_prog("ldconfig");
+# system $linux if (-x $linux);
+# }
- if ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix|darwin)/
+ if ($^O =~ /(?:linux|bsd|sun|sol|dragonfly|hpux|irix|darwin|gnu)/
&&
$usrlib !~ m!^/usr(/local)?/lib/?$!)
diff --git a/debian/patches/0007-hardening-flags.patch b/debian/patches/0007-hardening-flags.patch
index 9677e51..fad44ea 100644
--- a/debian/patches/0007-hardening-flags.patch
+++ b/debian/patches/0007-hardening-flags.patch
@@ -6,7 +6,7 @@ Last-Update: 2012-12-12
--- a/inc/MyBuilder.pm
+++ b/inc/MyBuilder.pm
-@@ -327,7 +327,7 @@
+@@ -328,7 +328,7 @@ sub ACTION_create_library {
if ($^O =~ /darwin/) {
$extra_linker_flags = "-install_name $libpath";
} elsif ($LIBEXT eq ".so") {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libtext-bibtex-perl.git
More information about the Pkg-perl-cvs-commits
mailing list