[SCM] Debian packaging of libnet-mac-vendor-perl branch, master, updated. df095b85963d1a815138c8c9edcf53dc43bc3c52

Harlan Lieberman-Berg H.LiebermanBerg at gmail.com
Thu Oct 18 22:40:25 UTC 2012


The following commit has been merged in the master branch:
commit 69bf064823619edf254a2775d5c0c460fb9bcc6a
Author: Harlan Lieberman-Berg <H.LiebermanBerg at gmail.com>
Date:   Thu Oct 18 18:41:20 2012 -0400

    d/*: Rework files to latest S-V.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 7df3fd2..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index ad9a1d5..d2fb9a4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,13 @@ Uploaders: Matt Zagrabelny <mzagrabe at d.umn.edu>,
            Ansgar Burchardt <ansgar at debian.org>
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7.0.8),
-               quilt
+Build-Depends: debhelper (>= 8)
 Build-Depends-Indep: perl,
                      libwww-perl,
                      libtest-pod-perl,
                      libtest-pod-coverage-perl,
                      libdbm-deep-perl
-Standards-Version: 3.8.2
+Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libnet-mac-vendor-perl.git
 Vcs-Git: git://git.debian.org/pkg-perl/packages/libnet-mac-vendor-perl.git
 Homepage: http://search.cpan.org/dist/Net-MAC-Vendor/
diff --git a/debian/copyright b/debian/copyright
index 49b92b0..4164804 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,15 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: brian d foy <bdfoy at cpan.org>
-Upstream-Source: http://search.cpan.org/dist/Net-MAC-Vendor/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: brian d foy <bdfoy at cpan.org>
 Upstream-Name: Net-MAC-Vendor
+Source: http://search.cpan.org/dist/Net-MAC-Vendor/
 
 Files: *
 Copyright: Copyright 2004-2007, brian d foy <bdfoy at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: debian/*
 Copyright: Copyright 2009, Matt Zagrabelny <mzagrabe at d.umn.edu>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 License: Artistic
     This program is free software; you can redistribute it and/or modify
@@ -24,4 +23,4 @@ License: GPL-1+
     the Free Software Foundation; either version 1, or (at your option)
     any later version.
     On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+    Public License can be found in `/usr/share/common-licenses/GPL-1'
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
deleted file mode 100644
index fbd3447..0000000
--- a/debian/patches/makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Ansgar Burchardt <ansgar at 43-1.org>
-Date: Sun, 21 Jun 2009 19:41:17 +0200
-Subject: Install man page with correct section in filename
---- libnet-mac-vendor-perl.orig/Makefile.PL
-+++ libnet-mac-vendor-perl/Makefile.PL
-@@ -20,7 +20,7 @@
- 		},
- 
- 	'MAN3PODS'     => {
--		'lib/Vendor.pm' => '$(INST_MAN3DIR)/Net::MAC::Vendor.3',
-+		'lib/Vendor.pm' => '$(INST_MAN3DIR)/Net::MAC::Vendor.3pm',
- 		},
- 
- 	clean  => { FILES    => q|Net-MAC-Vendor-* Makefile.old MANIFEST.bak| },
diff --git a/debian/patches/network-tests.patch b/debian/patches/network-tests.patch
index b90c502..b48771d 100644
--- a/debian/patches/network-tests.patch
+++ b/debian/patches/network-tests.patch
@@ -2,17 +2,9 @@ Subject: Do not fail tests if not connected to the network
 From: Ansgar Burchardt <ansgar at 43-1.org>
 Date: Sun, 21 Jun 2009 19:24:30 +0200
 
---- libnet-mac-vendor-perl.orig/t/fetch_oui.t
-+++ libnet-mac-vendor-perl/t/fetch_oui.t
-@@ -1,6 +1,6 @@
- # $Id: fetch_oui.t 1879 2006-06-26 02:05:08Z comdog $
- 
--use Test::More tests => 12;
-+use Test::More tests => 11;
- 
- use LWP::Simple qw(head);
- 
-@@ -14,7 +14,7 @@
+--- a/t/fetch_oui.t
++++ b/t/fetch_oui.t
+@@ -15,7 +15,7 @@
  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
  my $connected = head( 'http://standards.ieee.org/regauth/oui/oui.txt' );
  
@@ -21,10 +13,3 @@ Date: Sun, 21 Jun 2009 19:24:30 +0200
  
  # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
   # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-@@ -87,4 +87,4 @@
- 
- unlink( 'mac_oui.db' );
- ok( ! -e 'mac_oui.db', "Cache file has been unlinked" );
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/series b/debian/patches/series
index e85272f..e998461 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-makefile.patch
 network-tests.patch
diff --git a/debian/rules b/debian/rules
index 931d500..cbe925d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,3 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with quilt
+	dh $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..46ebe02
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
\ No newline at end of file

-- 
Debian packaging of libnet-mac-vendor-perl



More information about the Pkg-perl-cvs-commits mailing list