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 df9e10d2563fac2085661b12ec1075de643dcd9f
Author: gregor herrmann <gre...@debian.org>
Date:   Mon Oct 31 20:59:12 2016 +0100

    Refresh remaining patches.
---
 debian/patches/0001-Fix-spelling-errors.patch              |  2 +-
 ...roduce-a-btparse_api_version-note-and-use-it-in-d.patch | 14 ++++++++------
 .../0004-disable-rpath-if-installing-into-usr-lib.patch    |  6 +++---
 debian/patches/0005-no-ldconfig.patch                      |  2 +-
 debian/patches/0006-manpage-section.patch                  |  2 +-
 debian/patches/0007-hardening-flags.patch                  |  8 ++++----
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/debian/patches/0001-Fix-spelling-errors.patch 
b/debian/patches/0001-Fix-spelling-errors.patch
index aa6b6a3..838e738 100644
--- a/debian/patches/0001-Fix-spelling-errors.patch
+++ b/debian/patches/0001-Fix-spelling-errors.patch
@@ -39,7 +39,7 @@ Last-Update: 2016-07-09
  On seeing C<at> at top-level, we enter in-entry mode.  Whitespace, junk,
 --- a/lib/Text/BibTeX.pm
 +++ b/lib/Text/BibTeX.pm
-@@ -665,7 +665,7 @@ the input string is returned.
+@@ -667,7 +667,7 @@ the input string is returned.
  
  OPTIONS is currently unused.
  
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 ede04f5..fd3a4aa 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
@@ -34,15 +34,16 @@ Build.PL.
  $builder->install_path( 'usrlib' => $libdir );
 --- a/inc/MyBuilder.pm
 +++ b/inc/MyBuilder.pm
-@@ -15,6 +15,7 @@ use ExtUtils::Mkbootstrap;
+@@ -15,7 +15,7 @@ use ExtUtils::Mkbootstrap;
  
  use File::Spec::Functions qw.catdir catfile.;
  use File::Path qw.mkpath.;
+-use Cwd 'abs_path';
 +use Cwd;
  
  my @EXTRA_FLAGS = ();
- 
-@@ -303,9 +304,14 @@ sub ACTION_create_library {
+ my @BINARIES = qw(biblex bibparse dumpnames);
+@@ -311,9 +311,14 @@ sub ACTION_create_library {
  
  
      my $libbuilder = $self->notes('libbuilder');
@@ -58,7 +59,7 @@ Build.PL.
  
      my @modules = qw:init input bibtex err scan error
                       lex_auxiliary parse_auxiliary bibtex_ast sym
-@@ -315,14 +321,14 @@ sub ACTION_create_library {
+@@ -323,15 +328,15 @@ sub ACTION_create_library {
      my @objects = map { "btparse/src/$_.o" } @modules;
  
      my $libpath = $self->notes('lib_path');
@@ -69,14 +70,15 @@ Build.PL.
  
      my $extra_linker_flags = "";
      if ($^O =~ /darwin/) {
-         $extra_linker_flags = "-install_name $libpath";
+        my $abs_path = abs_path($libfile);
+        $extra_linker_flags = "-install_name $abs_path";
      } elsif ($LIBEXT eq ".so") {
 -        $extra_linker_flags = "-Wl,-soname,libbtparse$LIBEXT";
 +        $extra_linker_flags = "-Wl,-soname,$SONAME";
      }
  
      if (!$self->up_to_date(\@objects, $libfile)) {
-@@ -332,6 +338,14 @@ sub ACTION_create_library {
+@@ -341,6 +346,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 4ccf6c4..c944f61 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
@@ -11,9 +11,9 @@ libraries in the files system.
 
 --- a/inc/MyBuilder.pm
 +++ b/inc/MyBuilder.pm
-@@ -191,8 +191,14 @@ sub ACTION_create_binaries {
+@@ -209,8 +209,14 @@ sub ACTION_create_binaries {
  
-     print STDERR "\n** Creating binaries (dumpnames$EXEEXT, biblex$EXEEXT, 
bibparse$EXEEXT)\n";
+     print STDERR "\n** Creating binaries (",join(", ", map { $_.$EXEEXT } 
@BINARIES), ")\n";
  
 +    my $rpath_arg = '';
 +
@@ -26,4 +26,4 @@ libraries in the files system.
 +                                   $rpath_arg);
  
      my @toinstall;
-     my $exe_file = catfile("btparse","progs","dumpnames$EXEEXT");
+ 
diff --git a/debian/patches/0005-no-ldconfig.patch 
b/debian/patches/0005-no-ldconfig.patch
index 0d2949f..a3cb0f1 100644
--- a/debian/patches/0005-no-ldconfig.patch
+++ b/debian/patches/0005-no-ldconfig.patch
@@ -6,7 +6,7 @@ Last-Update: 2016-07-09
 
 --- a/inc/MyBuilder.pm
 +++ b/inc/MyBuilder.pm
-@@ -35,10 +35,10 @@ sub ACTION_install {
+@@ -52,10 +52,10 @@ sub ACTION_install {
          $self->install_path( 'usrlib' => $usrlib );
      }
      $self->SUPER::ACTION_install;
diff --git a/debian/patches/0006-manpage-section.patch 
b/debian/patches/0006-manpage-section.patch
index f172094..3a17bca 100644
--- a/debian/patches/0006-manpage-section.patch
+++ b/debian/patches/0006-manpage-section.patch
@@ -6,7 +6,7 @@ Last-Update: 2016-07-09
 
 --- a/inc/MyBuilder.pm
 +++ b/inc/MyBuilder.pm
-@@ -144,18 +144,18 @@ sub ACTION_create_manpages {
+@@ -162,18 +162,18 @@ sub ACTION_create_manpages {
      my $version = $self->notes('btparse_version');
      for my $pod (@$pods) {
          my $man = $pod;
diff --git a/debian/patches/0007-hardening-flags.patch 
b/debian/patches/0007-hardening-flags.patch
index e01b79b..3c95eea 100644
--- a/debian/patches/0007-hardening-flags.patch
+++ b/debian/patches/0007-hardening-flags.patch
@@ -6,7 +6,7 @@ Last-Update: 2016-07-09
 
 --- a/inc/MyBuilder.pm
 +++ b/inc/MyBuilder.pm
-@@ -175,7 +175,7 @@ sub ACTION_create_objects {
+@@ -193,7 +193,7 @@ sub ACTION_create_objects {
          $object =~ s/\.c/.o/;
          next if $self->up_to_date($file, $object);
          $cbuilder->compile(object_file  => $object,
@@ -15,9 +15,9 @@ Last-Update: 2016-07-09
                             source       => $file,
                             include_dirs => ["btparse/src"]);
      }
-@@ -334,7 +334,7 @@ sub ACTION_create_library {
-     if ($^O =~ /darwin/) {
-         $extra_linker_flags = "-install_name $libpath";
+@@ -342,7 +342,7 @@ sub ACTION_create_library {
+        my $abs_path = abs_path($libfile);
+        $extra_linker_flags = "-install_name $abs_path";
      } elsif ($LIBEXT eq ".so") {
 -        $extra_linker_flags = "-Wl,-soname,$SONAME";
 +        $extra_linker_flags = "-Wl,-soname,$SONAME $ENV{LDFLAGS}";

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

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to