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

Wed Sep 30 15:44:37 UTC 2009

Date: Wednesday, September 30, 2009 @ 15:44:35
  Author: davidvilla-guest
Revision: 9907

release 2.0.1-1

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

Modified: packages/scapy/trunk/debian/changelog
===================================================================

--- packages/scapy/trunk/debian/changelog	2009-09-30 12:59:27 UTC (rev 9906)
+++ packages/scapy/trunk/debian/changelog	2009-09-30 15:44:35 UTC (rev 9907)
@@ -1,9 +1,19 @@
-scapy (2.0.0.5-2) UNRELEASED; urgency=low
+scapy (2.0.1-1) unstable; urgency=low
 
+  [ Sandro Tosi ]
   * debian/control
     - switch Vcs-Browser field to viewsvn
+  [ Yves-Alexis Perez ]
+  * new upstream release.
+  * debian/control:
+    - update standards version to 3.8.3.
+    - add ${misc:Depends} to depends since we use debhelper.
+  * debian/patches:
+    - both patches refreshed for new upstream.
+  [ David Villa ]
+  * new upstream release (Closes: #485767)
 
- -- Sandro Tosi <morph at debian.org>  Mon, 03 Nov 2008 22:16:26 +0100
+ -- David Villa Alises <David.Villa at uclm.es>  Wed, 30 Sep 2009 17:27:46 +0200
 
 scapy (2.0.0.5-1) unstable; urgency=low
 

Modified: packages/scapy/trunk/debian/control
===================================================================
--- packages/scapy/trunk/debian/control	2009-09-30 12:59:27 UTC (rev 9906)
+++ packages/scapy/trunk/debian/control	2009-09-30 15:44:35 UTC (rev 9907)
@@ -4,14 +4,14 @@
 Maintainer: David Villa Alises <David.Villa at uclm.es>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.38), cdbs (>=0.4.43), python-all-dev, python-support (>= 0.3)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: http://www.secdev.org/projects/scapy/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/scapy/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/scapy/trunk/
 
 Package: python-scapy
 Architecture: all
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${misc:Depends}
 Suggests: tcpdump, graphviz, imagemagick, python-gnuplot, python-crypto, python-pyx, ebtables, python-visual, sox, xpdf, gv
 Replaces: scapy (<< 1.0.5-1)
 Conflicts: scapy (<< 1.0.5-1) 

Modified: packages/scapy/trunk/debian/patches/paths.patch
===================================================================
--- packages/scapy/trunk/debian/patches/paths.patch	2009-09-30 12:59:27 UTC (rev 9906)
+++ packages/scapy/trunk/debian/patches/paths.patch	2009-09-30 15:44:35 UTC (rev 9907)
@@ -1,20 +1,20 @@
-diff -Nur -x '*.orig' -x '*~' scapy-2.0.0.5/scapy/arch.py scapy-2.0.0.5.new/scapy/arch.py
---- scapy-2.0.0.5/scapy/arch.py	2008-08-17 17:42:06.000000000 +0200
-+++ scapy-2.0.0.5.new/scapy/arch.py	2008-08-17 19:43:22.410183551 +0200
-@@ -77,7 +77,7 @@
-                 raise
+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
+@@ -66,7 +66,7 @@
  
- if not PCAP:
--    f = os.popen("tcpdump -V 2> /dev/null")
-+    f = os.popen("/usr/sbin/tcpdump -V 2> /dev/null")
+ 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:
          log_loading.warning("Failed to execute tcpdump. Check it is installed and in the PATH")
          TCPDUMP=0
-diff -Nur -x '*.orig' -x '*~' scapy-2.0.0.5/scapy/config.py scapy-2.0.0.5.new/scapy/config.py
---- scapy-2.0.0.5/scapy/config.py	2008-08-17 17:42:06.000000000 +0200
-+++ scapy-2.0.0.5.new/scapy/config.py	2008-08-17 19:41:52.857923072 +0200
-@@ -35,11 +35,11 @@
-         return s[:-1]
+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
+@@ -52,11 +52,11 @@
+ 
      
  class ProgPath(ConfClass):
 -    pdfreader = "acroread"

Modified: packages/scapy/trunk/debian/patches/setup.py.patch
===================================================================
--- packages/scapy/trunk/debian/patches/setup.py.patch	2009-09-30 12:59:27 UTC (rev 9906)
+++ packages/scapy/trunk/debian/patches/setup.py.patch	2009-09-30 15:44:35 UTC (rev 9907)
@@ -1,10 +1,10 @@
-diff -Nur -x '*.orig' -x '*~' scapy-2.0.0.5/setup.py scapy-2.0.0.5.new/setup.py
---- scapy-2.0.0.5/setup.py	2008-08-17 17:42:06.000000000 +0200
-+++ scapy-2.0.0.5.new/setup.py	2008-08-17 19:21:33.316212186 +0200
+diff -r c38f49beca61 setup.py
+--- a/setup.py	Mon Sep 21 19:21:50 2009 +0200
++++ b/setup.py	Wed Sep 23 13:01:32 2009 +0200
 @@ -39,7 +39,7 @@
      name = 'scapy',
-     version = '2.0.0.5', 
-     packages=['scapy','scapy/layers','scapy/asn1','scapy/tools','scapy/modules'],
+     version = '2.0.1-dev', 
+     packages=['scapy','scapy/arch', 'scapy/layers','scapy/asn1','scapy/tools','scapy/modules'],
 -    scripts = ['bin/scapy','bin/UTscapy'],
 +    scripts = ['bin/scapy'],
      data_files = [('share/man/man1', ["doc/scapy.1.gz"])],


