[libdevice-usb-perl] 04/06: Drop pod-encoding.diff, merged upstream.

Mon Oct 28 22:38:39 UTC 2013

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

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

commit 8e912358d826b765e80cc2fa21fe01267cfce595
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Oct 28 23:36:30 2013 +0100

    Drop pod-encoding.diff, merged upstream.
    
    Refresh remaining patches.
---
 debian/patches/disable-tests                    |    3 +++
 debian/patches/fix-buildsystem                  |    3 +++
 debian/patches/fix-typo                         |    5 +++-
 debian/patches/hardening-flags.diff             |   10 ++++----
 debian/patches/just-assume-libusb-is-there.diff |   11 +++++----
 debian/patches/pod-encoding.diff                |   29 -----------------------
 debian/patches/series                           |    1 -
 7 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/debian/patches/disable-tests b/debian/patches/disable-tests
index ccb70d2..416b560 100644
--- a/debian/patches/disable-tests
+++ b/debian/patches/disable-tests
@@ -2,7 +2,10 @@ Description: Disable failing tests
  When run in pbuilder, some USB tests are failing consistently.  This
  is most likely because this environment has no access to the USB
  devices.
+Forwarded: not-needed
 Author: Tim Retout <diocles at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-10-28
 
 --- a/t/02-find_busses_devices.t
 +++ b/t/02-find_busses_devices.t
diff --git a/debian/patches/fix-buildsystem b/debian/patches/fix-buildsystem
index 9cee412..5201894 100644
--- a/debian/patches/fix-buildsystem
+++ b/debian/patches/fix-buildsystem
@@ -1,5 +1,8 @@
 Description: Ignore files we do not want installed.
+Forwarded: not-needed
 Author: Tim Retout <diocles at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-10-28
 
 --- a/Makefile.PL
 +++ b/Makefile.PL
diff --git a/debian/patches/fix-typo b/debian/patches/fix-typo
index 7b56fc8..1b429df 100644
--- a/debian/patches/fix-typo
+++ b/debian/patches/fix-typo
@@ -1,9 +1,12 @@
 Description: Fix typo in pod.
+Forwarded: no
 Author: Tim Retout <diocles at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-10-28
 
 --- a/lib/Device/USB.pm
 +++ b/lib/Device/USB.pm
-@@ -479,7 +479,7 @@
+@@ -481,7 +481,7 @@
  =head1 FOR MORE INFORMATION
  
  The project is hosted at Google Code L<http://code.google.com/p/perl-device-usb/>.
diff --git a/debian/patches/hardening-flags.diff b/debian/patches/hardening-flags.diff
index 734b821..2148a72 100644
--- a/debian/patches/hardening-flags.diff
+++ b/debian/patches/hardening-flags.diff
@@ -2,7 +2,7 @@ Description: pass *FLAGS to compiler and linker for hardening
 Origin: vendor
 Forwarded: no
 Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-05-12
+Last-Update: 2013-10-28
 
 --- a/lib/Device/USB.pm
 +++ b/lib/Device/USB.pm
@@ -17,7 +17,7 @@ Last-Update: 2013-05-12
 @@ -15,6 +16,8 @@
          ($ENV{LIBUSB_INCDIR} ? ( INC => "-I\"$ENV{LIBUSB_INCDIR}\"" ) : () ),
          NAME => 'Device::USB',
-         VERSION => '0.35',
+         VERSION => '0.36',
 +        CCFLAGS => "$Config{ccflags} $ENV{CFLAGS} $ENV{CPPFLAGS}",
 +        LDDLFLAGS => "$Config{lddlflags} $ENV{LDFLAGS}",
     );
@@ -33,9 +33,9 @@ Last-Update: 2013-05-12
  
  sub MY::libscan {
  	return if ($_[1] eq 'USB.pm' or $_[1] eq 'dump_usb.pl');
-@@ -68,6 +69,8 @@
-     clean               => {
-         FILES => 'Device-USB-* USB.inl _Inline'
+@@ -71,6 +72,8 @@
+         "ExtUtils::MakeMaker" => 0,
+         'Inline::MakeMaker' => 0,
      },
 +    CCFLAGS => "$Config{ccflags} $ENV{CFLAGS} $ENV{CPPFLAGS}",
 +    LDFLAGS => "$Config{lddlflags} $ENV{LDFLAGS}",
diff --git a/debian/patches/just-assume-libusb-is-there.diff b/debian/patches/just-assume-libusb-is-there.diff
index 0858fe6..9365eb4 100644
--- a/debian/patches/just-assume-libusb-is-there.diff
+++ b/debian/patches/just-assume-libusb-is-there.diff
@@ -1,10 +1,13 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Date: Mon, 29 Aug 2011 13:31:54 +0200
 Subject: Just assume libusb is out there
+ Makefile.PL should not try to check for libusb in a given list of directories
+ as the compiler might look in other places as well.
+Origin: vendor
 Bug-Debian: http://bugs.debian.org/639677
+Forwarded: not-needed
+From: Ansgar Burchardt <ansgar at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-10-28
 
-Makefile.PL should not try to check for libusb in a given list of directories
-as the compiler might look in other places as well.
 --- libdevice-usb-perl.orig/Makefile.PL
 +++ libdevice-usb-perl/Makefile.PL
 @@ -21,7 +21,7 @@
diff --git a/debian/patches/pod-encoding.diff b/debian/patches/pod-encoding.diff
deleted file mode 100644
index 42f8da2..0000000
--- a/debian/patches/pod-encoding.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: add encoding information to POD
-Origin: vendor
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=78940
-Bug-Debian: http://bugs.debian.org/708012
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=78940
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-05-12
-
---- a/lib/Device/USB.pm
-+++ b/lib/Device/USB.pm
-@@ -39,6 +39,8 @@
- use constant CLASS_DATA =>   10;
- use constant CLASS_VENDOR_SPEC => 0xff;
- 
-+=encoding utf8
-+
- =head1 NAME
- 
- Device::USB - Use libusb to access USB devices.
---- a/lib/Device/USB/Bus.pm
-+++ b/lib/Device/USB/Bus.pm
-@@ -5,6 +5,7 @@
- use strict;
- use Carp;
- 
-+=encoding utf8
- 
- =head1 NAME
- 
diff --git a/debian/patches/series b/debian/patches/series
index 71ec92c..3244e36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,4 @@ disable-tests
 fix-typo
 fix-buildsystem
 just-assume-libusb-is-there.diff
-pod-encoding.diff
 hardening-flags.diff

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

