[Python-modules-commits] r11917 - in packages/scapy/trunk/debian (4 files)

[davidvilla-guest at users.alioth.debian.org]

    Date: Wednesday, February 24, 2010 @ 12:49:43
  Author: davidvilla-guest
Revision: 11917

upstream release 2.1.0

Modified:
  packages/scapy/trunk/debian/changelog
  packages/scapy/trunk/debian/control
  packages/scapy/trunk/debian/patches/paths.patch
  packages/scapy/trunk/debian/rules

Modified: packages/scapy/trunk/debian/changelog
===================================================================
--- packages/scapy/trunk/debian/changelog	2010-02-24 12:45:30 UTC (rev 11916)
+++ packages/scapy/trunk/debian/changelog	2010-02-24 12:49:43 UTC (rev 11917)
@@ -1,3 +1,9 @@
+scapy (2.1.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #570343)
+
+ -- David Villa Alises <David.Villa at uclm.es>  Wed, 24 Feb 2010 12:43:23 +0100
+
 scapy (2.0.1-1) unstable; urgency=low
 
   [ Sandro Tosi ]
@@ -61,7 +67,7 @@
     - Updated download location and author e-mail address
   * Thanks to Scott Kitterman <scott at kitterman.com> for his patch
 
- -- David Villa Alises <David.Villa at uclm.es>  Thu, 10 May 2007 09:53:49 +0200  
+ -- David Villa Alises <David.Villa at uclm.es>  Thu, 10 May 2007 09:53:49 +0200
 
 scapy (1.0.5.20-1) unstable; urgency=low
 

Modified: packages/scapy/trunk/debian/control
===================================================================
--- packages/scapy/trunk/debian/control	2010-02-24 12:45:30 UTC (rev 11916)
+++ packages/scapy/trunk/debian/control	2010-02-24 12:49:43 UTC (rev 11917)
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: David Villa Alises <David.Villa at uclm.es>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Francisco Moya <paco at debian.org>
 Build-Depends: debhelper (>= 5.0.38), cdbs (>=0.4.43), python-all-dev, python-support (>= 0.3)
 Standards-Version: 3.8.3
 Homepage: http://www.secdev.org/projects/scapy/
@@ -12,7 +12,7 @@
 Package: python-scapy
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
-Suggests: tcpdump, graphviz, imagemagick, python-gnuplot, python-crypto, python-pyx, ebtables, python-visual, sox, xpdf, gv
+Suggests: tcpdump, tcpreplay, wireshark, graphviz, imagemagick, python-gnuplot, python-crypto, python-pyx, ebtables, python-visual, sox, xpdf, gv, hexer
 Replaces: scapy (<< 1.0.5-1)
 Conflicts: scapy (<< 1.0.5-1)
 Description: Packet generator/sniffer and network scanner/discovery

Modified: packages/scapy/trunk/debian/patches/paths.patch
===================================================================
--- packages/scapy/trunk/debian/patches/paths.patch	2010-02-24 12:45:30 UTC (rev 11916)
+++ packages/scapy/trunk/debian/patches/paths.patch	2010-02-24 12:49:43 UTC (rev 11917)
@@ -1,18 +1,18 @@
-diff -r c38f49beca61 scapy/arch/linux.py
---- a/scapy/arch/linux.py	Mon Sep 21 19:21:50 2009 +0200
-+++ b/scapy/arch/linux.py	Wed Sep 23 12:14:41 2009 +0200
+diff -Nur -x '*.orig' -x '*~' scapy-2.1.0//scapy/arch/linux.py scapy-2.1.0.new//scapy/arch/linux.py
+--- scapy-2.1.0//scapy/arch/linux.py	2009-12-14 16:31:55.000000000 +0100
++++ scapy-2.1.0.new//scapy/arch/linux.py	2010-02-24 13:33:46.453297258 +0100
 @@ -66,7 +66,7 @@
  
  LOOPBACK_NAME="lo"
  
--with os.popen("tcpdump -V 2> /dev/null") as f:
-+with os.popen("/usr/sbin/tcpdump -V 2> /dev/null") as f:
-     if f.close() >> 8 == 0x7f:
+-with os.popen("tcpdump -V 2> /dev/null") as _f:
++with os.popen("/usr/sbin/tcpdump -V 2> /dev/null") as _f:
+     if _f.close() >> 8 == 0x7f:
          log_loading.warning("Failed to execute tcpdump. Check it is installed and in the PATH")
          TCPDUMP=0
-diff -r c38f49beca61 scapy/config.py
---- a/scapy/config.py	Mon Sep 21 19:21:50 2009 +0200
-+++ b/scapy/config.py	Wed Sep 23 12:14:41 2009 +0200
+diff -Nur -x '*.orig' -x '*~' scapy-2.1.0//scapy/config.py scapy-2.1.0.new//scapy/config.py
+--- scapy-2.1.0//scapy/config.py	2009-12-14 16:31:55.000000000 +0100
++++ scapy-2.1.0.new//scapy/config.py	2010-02-24 13:33:37.229297335 +0100
 @@ -52,11 +52,11 @@
  
      

Modified: packages/scapy/trunk/debian/rules
===================================================================
--- packages/scapy/trunk/debian/rules	2010-02-24 12:45:30 UTC (rev 11916)
+++ packages/scapy/trunk/debian/rules	2010-02-24 12:49:43 UTC (rev 11917)
@@ -1,15 +1,25 @@
 #!/usr/bin/make -f
 
 #export DH_VERBOSE=1
-DEB_PYTHON_SYSTEM=pysupport
+# DEB_PYTHON_SYSTEM=pysupport
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# include /usr/share/cdbs/1/rules/debhelper.mk
+# include /usr/share/cdbs/1/class/python-distutils.mk
+# include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+# DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
-clean::
+
+include /usr/share/dpatch/dpatch.make
+
+build: patch-stamp
+	dh build
+
+%:
+	dh $@
+
+clean:: unpatch
+	dh clean
 	-rm -rf build