[SCM] Debian packaging of libnet-libdnet-perl branch, master, updated. 63c14c45591874cf98a7849519adb816d37b85dc

[Florian Schlichting]

The following commit has been merged in the master branch:
commit c0ae5f316ae5e44eb0991e873b08d11437c206af
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Fri Nov 25 20:36:04 2011 +0000

    Re-add libdumbnet patch, now shipped but not applied by upstream

diff --git a/debian/changelog b/debian/changelog
index 06fced6..77d656c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ libnet-libdnet-perl (0.96-1) UNRELEASED; urgency=low
   * Imported Upstream version 0.96
   * Bump debhelper compatibility level to 8 (no changes)
   * Bump Standards-Version to 3.9.2 (no changes)
+  * Re-add libdumbnet patch, now shipped but not applied by upstream (and
+    refresh fix-pod-spelling.patch)
 
   [ Jonathan Yu ]
   * New upstream release
diff --git a/debian/patches/fix-pod-spelling.patch b/debian/patches/fix-pod-spelling.patch
index 5c6dfdb..05a9870 100644
--- a/debian/patches/fix-pod-spelling.patch
+++ b/debian/patches/fix-pod-spelling.patch
@@ -1,15 +1,15 @@
 Description: fix POD spelling errors
 Author: Jonathan Yu <jawnsy at cpan.org>
 Origin: vendor
-Forwarded: no
+Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=72729
 --- a/lib/Net/Libdnet.pm
 +++ b/lib/Net/Libdnet.pm
-@@ -333,7 +333,7 @@
+@@ -340,7 +340,7 @@
  
  All the original and obsolete functions return I<undef> and print a warning message to the standard error when a problem occurs. The obsolete functions are: B<addr_cmp>, B<addr_bcast>, B<addr_net>, B<arp_add>, B<arp_delete>, B<arp_get>, B<intf_get>, B<intf_get_src>, B<intf_get_dst>, B<route_add>, B<route_delete>, B<route_get>.
  
 -These osbsolete functions will continue to work, to keep backward compatibility, but should not be used anymore. The new APIs should be prefered. There are two new APIs, one is the low-level one, matching libdnet functions, and the other one is a high-level API, matching a more Perl object oriented programming. This latest one is highly prefered.
-+These osbsolete functions will continue to work, to keep backward compatibility, but should not be used anymore. The new APIs should be preferred. There are two new APIs, one is the low-level one, matching libdnet functions, and the other one is a high-level API, matching a more Perl object oriented programming. This latest one is highly preferred.
++These obsolete functions will continue to work, to keep backward compatibility, but should not be used anymore. The new APIs should be preferred. There are two new APIs, one is the low-level one, matching libdnet functions, and the other one is a high-level API, matching a more Perl object oriented programming. This latest one is highly preferred.
  
  Net::Libdnet module implements the low-level API. The high-level API is accessible by using the following modules: B<Net::Libdnet::Intf>, B<Net::Libdnet::Route>, B<Net::Libdnet::Fw>, B<Net::Libdnet::Arp>, B<Net::Libdnet::Eth>, B<Net::Libdnet::Ip> and B<Net::Libdnet::Tun>.
  
diff --git a/debian/patches/series b/debian/patches/series
index 5622f22..bec8b4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-pod-spelling.patch
+ubuntu-new.patch
diff --git a/ubuntu-new.patch b/debian/patches/ubuntu-new.patch
similarity index 73%
copy from ubuntu-new.patch
copy to debian/patches/ubuntu-new.patch
index d45a34d..f55b73b 100644
--- a/ubuntu-new.patch
+++ b/debian/patches/ubuntu-new.patch
@@ -1,7 +1,11 @@
+Description: Debian uses "dumbnet" instead of of "dnet" for historical reasons
+Origin: upstream, shipped in CPAN distribution
+Forwarded: not-needed
+
 Index: Libdnet.xs
 ===================================================================
---- Libdnet.xs	(revision 41)
-+++ Libdnet.xs	(working copy)
+--- a/Libdnet.xs	(revision 41)
++++ b/Libdnet.xs	(working copy)
 @@ -34,7 +34,7 @@
  #include "XSUB.h"
  
@@ -13,8 +17,8 @@ Index: Libdnet.xs
  typedef blob_t              Blob;
 Index: Makefile.PL
 ===================================================================
---- Makefile.PL	(revision 41)
-+++ Makefile.PL	(working copy)
+--- a/Makefile.PL	(revision 41)
++++ b/Makefile.PL	(working copy)
 @@ -3,10 +3,10 @@
  #
  use ExtUtils::MakeMaker;

-- 
Debian packaging of libnet-libdnet-perl