[DRE-commits] r4674 - in trunk/libpcap-ruby/debian: . patches
Paul van Tilburg
paulvt at alioth.debian.org
Sun Feb 14 18:06:06 UTC 2010
Author: paulvt
Date: 2010-02-14 18:05:53 +0000 (Sun, 14 Feb 2010)
New Revision: 4674
Added:
trunk/libpcap-ruby/debian/README.source
trunk/libpcap-ruby/debian/patches/06_linux_cooked_support.dpatch
trunk/libpcap-ruby/debian/patches/07_filter_regexp_init.dpatch
Modified:
trunk/libpcap-ruby/debian/changelog
trunk/libpcap-ruby/debian/control
trunk/libpcap-ruby/debian/copyright
trunk/libpcap-ruby/debian/patches/00list
Log:
* debian/control:
- Bumped standards version to 3.8.4.
- Changed section to "ruby" per ftp-masters' request.
- Fixed the Vcs-* URLs to comply with the new layout.
- Added ${misc:Depends} to the depends of libpcap-ruby and libpcap-ruby1.8.
* debian/copyright: fixed the common license symlink to point to GPL-2.
* debian/patches:
- Added 06_linux_cooked_support.dpatch, courtesy of Guillaume Teissier
(closes: #510487).
- Added 07_filter_regexp_init.dpatch, courtesy of Clinton Gower
(closes: #557043)
* README.source: added to explain that dpatch is used in this package.
Added: trunk/libpcap-ruby/debian/README.source
===================================================================
--- trunk/libpcap-ruby/debian/README.source (rev 0)
+++ trunk/libpcap-ruby/debian/README.source 2010-02-14 18:05:53 UTC (rev 4674)
@@ -0,0 +1,7 @@
+This package uses dpatch 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/dpatch/README.source.gz for a detailed explanation.
+
+ -- Paul van Tilburg <paulvt at debian.org>, Sun, 14 Deb 2010 19:03:14 +0100
Modified: trunk/libpcap-ruby/debian/changelog
===================================================================
--- trunk/libpcap-ruby/debian/changelog 2010-02-14 17:43:49 UTC (rev 4673)
+++ trunk/libpcap-ruby/debian/changelog 2010-02-14 18:05:53 UTC (rev 4674)
@@ -1,3 +1,20 @@
+libpcap-ruby (0.6-10) unstable; urgency=low
+
+ * debian/control:
+ - Bumped standards version to 3.8.4.
+ - Changed section to "ruby" per ftp-masters' request.
+ - Fixed the Vcs-* URLs to comply with the new layout.
+ - Added ${misc:Depends} to the depends of libpcap-ruby and libpcap-ruby1.8.
+ * debian/copyright: fixed the common license symlink to point to GPL-2.
+ * debian/patches:
+ - Added 06_linux_cooked_support.dpatch, courtesy of Guillaume Teissier
+ (closes: #510487).
+ - Added 07_filter_regexp_init.dpatch, courtesy of Clinton Gower
+ (closes: #557043)
+ * README.source: added to explain that dpatch is used in this package.
+
+ -- Paul van Tilburg <paulvt at debian.org> Sun, 14 Feb 2010 19:04:33 +0100
+
libpcap-ruby (0.6-9.1) unstable; urgency=low
* NMU
Modified: trunk/libpcap-ruby/debian/control
===================================================================
--- trunk/libpcap-ruby/debian/control 2010-02-14 17:43:49 UTC (rev 4673)
+++ trunk/libpcap-ruby/debian/control 2010-02-14 18:05:53 UTC (rev 4674)
@@ -1,17 +1,17 @@
Source: libpcap-ruby
-Section: interpreters
+Section: ruby
Priority: optional
Maintainer: Paul van Tilburg <paulvt at debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>> 5), cdbs, ruby-pkg-tools,libpcap-dev, dpatch, ruby1.8, ruby1.8-dev
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>> 5), cdbs, ruby-pkg-tools (>= 0.8), libpcap-dev, dpatch, ruby1.8, ruby1.8-dev
+Standards-Version: 3.8.4
Homepage: http://www.goto.info.waseda.ac.jp/~fukusima/ruby/pcap-e.html
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/libpcap-ruby/trunk/
-Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/libpcap-ruby/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-ruby-extras/packages/trunk/libpcap-ruby/
+Vcs-Svn: svn://svn.debian.org/pkg-ruby-extras/packages/trunk/libpcap-ruby/
Package: libpcap-ruby
Architecture: all
-Depends: libpcap-ruby1.8
+Depends: libpcap-ruby1.8, ${misc:Depends}
Description: Ruby interface for the libpcap packet capture library
libpcap (Packet CAPture) provides a portable framework for low-level
network monitoring. This package provides bindings for the Ruby programming
@@ -23,9 +23,9 @@
Package: libpcap-ruby1.8
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: libpcap-ruby
-Description: Ruby interface for the libpcap packet capture library
+Description: Ruby 1.8 interface for the libpcap packet capture library
libpcap (Packet CAPture) provides a portable framework for low-level
network monitoring. This package provides bindings for the Ruby programming
language, version 1.8.
Modified: trunk/libpcap-ruby/debian/copyright
===================================================================
--- trunk/libpcap-ruby/debian/copyright 2010-02-14 17:43:49 UTC (rev 4673)
+++ trunk/libpcap-ruby/debian/copyright 2010-02-14 18:05:53 UTC (rev 4674)
@@ -26,6 +26,5 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02111-1301, USA.
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
Modified: trunk/libpcap-ruby/debian/patches/00list
===================================================================
--- trunk/libpcap-ruby/debian/patches/00list 2010-02-14 17:43:49 UTC (rev 4673)
+++ trunk/libpcap-ruby/debian/patches/00list 2010-02-14 18:05:53 UTC (rev 4674)
@@ -3,3 +3,5 @@
03_debug_print.dpatch
04_findalldevs.dpatch
05_pcap_dispatch.dpatch
+06_linux_cooked_support.dpatch
+07_filter_regexp_init.dpatch
Added: trunk/libpcap-ruby/debian/patches/06_linux_cooked_support.dpatch
===================================================================
--- trunk/libpcap-ruby/debian/patches/06_linux_cooked_support.dpatch (rev 0)
+++ trunk/libpcap-ruby/debian/patches/06_linux_cooked_support.dpatch 2010-02-14 18:05:53 UTC (rev 4674)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_linux_cooked_support.dpatch by <guillaume.teissier at orange-ftgroup.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add support for datalink type Linux cooked
+
+ at DPATCH@
+diff -Nurb libpcap-ruby-0.6/packet.c pcap/packet.c
+--- libpcap-ruby-0.6/packet.c 2000-08-13 08:56:15.000000000 +0200
++++ pcap/packet.c 2009-01-02 14:08:57.000000000 +0100
+@@ -67,8 +67,9 @@
+ { 6, 8 }, /* 11: DLT_ATM_RFC1483 */
+ { -1, 0 }, /* 12: DLT_RAW */
+ { -1, 24 }, /* 13: DLT_SLIP_BSDOS */
+- { 5, 24 } /* 14: DLT_PPP_BSDOS */
+-#define DATALINK_MAX 14
++ { 5, 24 }, /* 14: DLT_PPP_BSDOS */
++ [113] = { 14, 16 } /* 113: DLT_LINUX_SLL */
++#define DATALINK_MAX 113
+ };
+
+ VALUE
+diff -Nurb libpcap-ruby-0.6/Pcap.c pcap/Pcap.c
+--- libpcap-ruby-0.6/Pcap.c 2000-08-13 07:56:31.000000000 +0200
++++ pcap/Pcap.c 2009-01-02 13:32:44.000000000 +0100
+@@ -744,6 +744,9 @@
+ rb_define_const(mPcap, "DLT_SLIP_BSDOS", INT2NUM(DLT_SLIP_BSDOS));
+ rb_define_const(mPcap, "DLT_PPP_BSDOS", INT2NUM(DLT_PPP_BSDOS));
+ #endif
++#ifdef DLT_LINUX_SLL
++ rb_define_const(mPcap, "DLT_LINUX_SLL", INT2NUM(DLT_LINUX_SLL));
++#endif
+
+ /* define class Capture */
+ cCapture = rb_define_class_under(mPcap, "Capture", rb_cObject);
Added: trunk/libpcap-ruby/debian/patches/07_filter_regexp_init.dpatch
===================================================================
--- trunk/libpcap-ruby/debian/patches/07_filter_regexp_init.dpatch (rev 0)
+++ trunk/libpcap-ruby/debian/patches/07_filter_regexp_init.dpatch 2010-02-14 18:05:53 UTC (rev 4674)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_filter_regexp_init.dpatch by <paulvt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad libpcap-ruby-0.6~/lib/pcaplet.rb libpcap-ruby-0.6/lib/pcaplet.rb
+--- libpcap-ruby-0.6~/lib/pcaplet.rb 2000-08-13 07:22:14.000000000 +0200
++++ libpcap-ruby-0.6/lib/pcaplet.rb 2010-02-14 18:53:06.000000000 +0100
+@@ -64,10 +64,10 @@
+ attr('capture')
+
+ def add_filter(f)
++ f = f.source if f.is_a? Filter
+ if @filter == nil || @filter =~ /^\s*$/ # if empty
+ @filter = f
+ else
+- f = f.source if f.is_a? Filter
+ @filter = "( #{@filter} ) and ( #{f} )"
+ end
+ @capture.setfilter(@filter)
Property changes on: trunk/libpcap-ruby/debian/patches/07_filter_regexp_init.dpatch
___________________________________________________________________
Added: svn:executable
+ *
More information about the Pkg-ruby-extras-commits
mailing list