[libdevice-usb-perl] 06/09: adapt fix-typo and hardening-flags.patch to apply

[Damyan Ivanov]

This is an automated email from the git hooks/post-receive script.

dmn pushed a commit to branch master
in repository libdevice-usb-perl.

commit a0b0dc693ad724988217a2f3d3f7336b0c298d18
Author: Damyan Ivanov <dmn at debian.org>
Date:   Sat Nov 11 16:24:24 2017 +0000

    adapt fix-typo and hardening-flags.patch to apply
---
 debian/patches/fix-typo             |  4 ++--
 debian/patches/hardening-flags.diff | 18 +++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/debian/patches/fix-typo b/debian/patches/fix-typo
index 1b429df..7d7cf7d 100644
--- a/debian/patches/fix-typo
+++ b/debian/patches/fix-typo
@@ -6,10 +6,10 @@ Last-Update: 2013-10-28
 
 --- a/lib/Device/USB.pm
 +++ b/lib/Device/USB.pm
-@@ -481,7 +481,7 @@
+@@ -595,7 +595,7 @@ your bug as I make changes.
  =head1 FOR MORE INFORMATION
  
- The project is hosted at Google Code L<http://code.google.com/p/perl-device-usb/>.
+ The project is hosted at github L<https://github.com/gwadej/perl-device-usb/>.
 -More information on the project, including installation help is avaliable on the
 +More information on the project, including installation help is available on the
  Wiki.
diff --git a/debian/patches/hardening-flags.diff b/debian/patches/hardening-flags.diff
index 2148a72..128a418 100644
--- a/debian/patches/hardening-flags.diff
+++ b/debian/patches/hardening-flags.diff
@@ -6,7 +6,7 @@ Last-Update: 2013-10-28
 
 --- a/lib/Device/USB.pm
 +++ b/lib/Device/USB.pm
-@@ -4,6 +4,7 @@
+@@ -4,9 +4,12 @@ require 5.006;
  use warnings;
  use strict;
  use Carp;
@@ -14,15 +14,11 @@ Last-Update: 2013-10-28
  
  use Inline (
          C => "DATA",
-@@ -15,6 +16,8 @@
-         ($ENV{LIBUSB_INCDIR} ? ( INC => "-I\"$ENV{LIBUSB_INCDIR}\"" ) : () ),
-         NAME => 'Device::USB',
-         VERSION => '0.36',
 +        CCFLAGS => "$Config{ccflags} $ENV{CFLAGS} $ENV{CPPFLAGS}",
 +        LDDLFLAGS => "$Config{lddlflags} $ENV{LDFLAGS}",
-    );
- 
- Inline->init();
+         ($ENV{LIBUSB_LIBDIR}
+             ? ( LIBS => "-L\"$ENV{LIBUSB_LIBDIR}\" " .
+                         ($^O eq 'MSWin32' ? ' -llibusb -L\"$ENV{WINDDK}\\lib\\crt\\i386\" -lmsvcrt ' : '-lusb') )
 --- a/Makefile.PL
 +++ b/Makefile.PL
 @@ -1,6 +1,7 @@
@@ -33,9 +29,9 @@ Last-Update: 2013-10-28
  
  sub MY::libscan {
  	return if ($_[1] eq 'USB.pm' or $_[1] eq 'dump_usb.pl');
-@@ -71,6 +72,8 @@
-         "ExtUtils::MakeMaker" => 0,
-         'Inline::MakeMaker' => 0,
+@@ -87,6 +88,8 @@ WriteMakefile(
+     test               => {
+         TESTS => 't/*.t xt/*.t',
      },
 +    CCFLAGS => "$Config{ccflags} $ENV{CFLAGS} $ENV{CPPFLAGS}",
 +    LDFLAGS => "$Config{lddlflags} $ENV{LDFLAGS}",

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