r15077 - in /trunk/libnet-arp-perl/debian: ./ patches/
ntyni at users.alioth.debian.org
ntyni at users.alioth.debian.org
Sun Feb 17 21:35:57 UTC 2008
Author: ntyni
Date: Sun Feb 17 21:35:56 2008
New Revision: 15077
URL: http://svn.debian.org/wsvn/?sc=1&rev=15077
Log:
* Convert patch handling from dpatch to quilt.
* Update 10alignment-and-headers.patch for the new release.
* 30doc_note.patch: documentation addition converted to quilt.
Added:
trunk/libnet-arp-perl/debian/patches/10alignment-and-headers.patch (contents, props changed)
- copied, changed from r15074, trunk/libnet-arp-perl/debian/patches/10alignment-and-headers.dpatch
trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch
trunk/libnet-arp-perl/debian/patches/30doc_note.patch (contents, props changed)
- copied, changed from r15074, trunk/libnet-arp-perl/debian/patches/30doc_note.dpatch
trunk/libnet-arp-perl/debian/patches/series
Removed:
trunk/libnet-arp-perl/debian/patches/00list
trunk/libnet-arp-perl/debian/patches/10alignment-and-headers.dpatch
trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.dpatch
trunk/libnet-arp-perl/debian/patches/30doc_note.dpatch
Modified:
trunk/libnet-arp-perl/debian/changelog
trunk/libnet-arp-perl/debian/control
trunk/libnet-arp-perl/debian/rules
Modified: trunk/libnet-arp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/changelog?rev=15077&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/changelog (original)
+++ trunk/libnet-arp-perl/debian/changelog Sun Feb 17 21:35:56 2008
@@ -22,8 +22,9 @@
[ Niko Tyni ]
* Fix remains of merging errors from integrating the new upstream release.
- * Update 10alignment-and-headers.dpatch for the new release.
- * 30doc_note.dpatch: documentation addition converted to dpatch format.
+ * Convert patch handling from dpatch to quilt.
+ * Update 10alignment-and-headers.patch for the new release.
+ * 30doc_note.patch: documentation addition converted to quilt.
-- Roberto C. Sanchez <roberto at connexer.com> Wed, 09 Jan 2008 23:48:47 -0500
Modified: trunk/libnet-arp-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/control?rev=15077&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/control (original)
+++ trunk/libnet-arp-perl/debian/control Sun Feb 17 21:35:56 2008
@@ -1,7 +1,7 @@
Source: libnet-arp-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 6), libnet-pcap-perl, perl (>= 5.8.8-6), dpatch (>= 2.0.9)
+Build-Depends: debhelper (>= 6), libnet-pcap-perl, perl (>= 5.8.8-6), quilt (>= 0.40)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>
Standards-Version: 3.7.3
Copied: trunk/libnet-arp-perl/debian/patches/10alignment-and-headers.patch (from r15074, trunk/libnet-arp-perl/debian/patches/10alignment-and-headers.dpatch)
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/patches/10alignment-and-headers.patch?rev=15077&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/patches/10alignment-and-headers.dpatch (original)
+++ trunk/libnet-arp-perl/debian/patches/10alignment-and-headers.patch Sun Feb 17 21:35:56 2008
@@ -1,14 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10alignment-and-headers.dpatch by Niko Tyni <ntyni at iki.fi>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix an unaligned assignment issue (#390020)
-## DP: Also include all the needed header files.
-
- at DPATCH@
-diff -urNad trunk~/ARP.xs trunk/ARP.xs
---- trunk~/ARP.xs 2007-02-27 18:20:04.000000000 -0600
-+++ trunk/ARP.xs 2007-02-27 18:24:21.000000000 -0600
+--- libnet-arp-perl.orig/ARP.xs
++++ libnet-arp-perl/ARP.xs
@@ -27,6 +27,7 @@
#include <string.h>
#include <errno.h>
@@ -51,9 +42,8 @@
// Run packet!! Run!
-diff -urNad trunk~/arp.h trunk/arp.h
---- trunk~/arp.h 2007-02-27 18:20:04.000000000 -0600
-+++ trunk/arp.h 2007-02-27 18:21:22.000000000 -0600
+--- libnet-arp-perl.orig/arp.h
++++ libnet-arp-perl/arp.h
@@ -43,7 +43,7 @@
#define IP_ALEN 4
@@ -63,9 +53,8 @@
u_short hw_type; // hardware type
u_short proto_type; // protocol type
u_char ha_len; // hardware address len
-diff -urNad trunk~/get_mac_linux.c trunk/get_mac_linux.c
---- trunk~/get_mac_linux.c 2007-02-27 18:20:04.000000000 -0600
-+++ trunk/get_mac_linux.c 2007-02-27 18:21:22.000000000 -0600
+--- libnet-arp-perl.orig/get_mac_linux.c
++++ libnet-arp-perl/get_mac_linux.c
@@ -23,6 +23,9 @@
#include <stdlib.h>
#include <sys/ioctl.h>
@@ -76,9 +65,8 @@
#include <net/if.h>
int get_mac_linux(u_char *dev, char *mac)
-diff -urNad trunk~/send_packet_linux.c trunk/send_packet_linux.c
---- trunk~/send_packet_linux.c 2007-02-27 18:20:04.000000000 -0600
-+++ trunk/send_packet_linux.c 2007-02-27 18:21:22.000000000 -0600
+--- libnet-arp-perl.orig/send_packet_linux.c
++++ libnet-arp-perl/send_packet_linux.c
@@ -22,6 +22,9 @@
#include <stdio.h>
#include <sys/types.h>
Added: trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch?rev=15077&op=file
==============================================================================
--- trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch (added)
+++ trunk/libnet-arp-perl/debian/patches/20skip_send_packet_test.patch Sun Feb 17 21:35:56 2008
@@ -1,0 +1,11 @@
+--- libnet-arp-perl.orig/t/send_packet.t
++++ libnet-arp-perl/t/send_packet.t
+@@ -5,7 +5,7 @@
+ # Last update: 31.01.2007
+
+ use Net::ARP;
+-use Test::More qw( no_plan );
++use Test::More skip_all => 'Requires real root privileges to build';
+
+ BEGIN
+ {
Copied: trunk/libnet-arp-perl/debian/patches/30doc_note.patch (from r15074, trunk/libnet-arp-perl/debian/patches/30doc_note.dpatch)
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/patches/30doc_note.patch?rev=15077&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/patches/30doc_note.dpatch (original)
+++ trunk/libnet-arp-perl/debian/patches/30doc_note.patch Sun Feb 17 21:35:56 2008
@@ -1,13 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30doc_note.dpatch by Gunnar Wolf <gwolf at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Documentation addition
-
- at DPATCH@
-diff -urNad libnet-arp-perl~/ARP.pm libnet-arp-perl/ARP.pm
---- libnet-arp-perl~/ARP.pm 2008-02-17 19:27:47.000000000 +0200
-+++ libnet-arp-perl/ARP.pm 2008-02-17 19:28:43.000000000 +0200
+--- libnet-arp-perl.orig/ARP.pm
++++ libnet-arp-perl/ARP.pm
@@ -87,6 +87,8 @@
This module can be used to create and send ARP packets and to
get the mac address of an ethernet interface or ip address.
Added: trunk/libnet-arp-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/patches/series?rev=15077&op=file
==============================================================================
--- trunk/libnet-arp-perl/debian/patches/series (added)
+++ trunk/libnet-arp-perl/debian/patches/series Sun Feb 17 21:35:56 2008
@@ -1,0 +1,3 @@
+10alignment-and-headers.patch
+20skip_send_packet_test.patch
+30doc_note.patch
Modified: trunk/libnet-arp-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libnet-arp-perl/debian/rules?rev=15077&op=diff
==============================================================================
--- trunk/libnet-arp-perl/debian/rules (original)
+++ trunk/libnet-arp-perl/debian/rules Sun Feb 17 21:35:56 2008
@@ -19,7 +19,7 @@
TMP =$(CURDIR)/debian/$(PACKAGE)
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
# Allow disabling build optimation by setting noopt in
# $DEB_BUILD_OPTIONS
@@ -30,8 +30,8 @@
CFLAGS += -O2
endif
-build: patch-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
# Add commands to compile the package here
More information about the Pkg-perl-cvs-commits
mailing list