[Python-modules-commits] r2183 - in /packages/twistedsnmp/trunk/debian/patches: faster_decoding-zenoss_patch05.dpatch like_v1_no_obj-zenoss_patch03.dpatch pkt_id_correlate-zenoss_patch02.dpatch timeout_leak-zenoss_patch04.dpatch unique_id-zenoss_patch01.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Thu Apr 26 15:13:39 2007
New Revision: 2183

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2183
Log:
make zenoss patch dpatch-compatible

Modified:
    packages/twistedsnmp/trunk/debian/patches/faster_decoding-zenoss_patch05.dpatch
    packages/twistedsnmp/trunk/debian/patches/like_v1_no_obj-zenoss_patch03.dpatch
    packages/twistedsnmp/trunk/debian/patches/pkt_id_correlate-zenoss_patch02.dpatch
    packages/twistedsnmp/trunk/debian/patches/timeout_leak-zenoss_patch04.dpatch
    packages/twistedsnmp/trunk/debian/patches/unique_id-zenoss_patch01.dpatch

Modified: packages/twistedsnmp/trunk/debian/patches/faster_decoding-zenoss_patch05.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/twistedsnmp/trunk/debian/patches/faster_decoding-zenoss_patch05.dpatch?rev=2183&op=diff
==============================================================================
--- packages/twistedsnmp/trunk/debian/patches/faster_decoding-zenoss_patch05.dpatch (original)
+++ packages/twistedsnmp/trunk/debian/patches/faster_decoding-zenoss_patch05.dpatch Thu Apr 26 15:13:39 2007
@@ -6,8 +6,9 @@
 ## DP: See http://dev.zenoss.org/trac/browser/trunk/inst/externallibs/TwistedSNMP-0.3.13.patch05
 
 @DPATCH@
---- snmpprotocol.py	2006-03-23 16:54:51.000000000 -0500
-+++ snmpprotocol.py.new	2007-02-20 07:32:06.000000000 -0500
+diff -urNad trunk~/snmpprotocol.py trunk/snmpprotocol.py
+--- trunk~/snmpprotocol.py	2006-03-23 16:54:51.000000000 -0500
++++ trunk/snmpprotocol.py	2007-02-20 07:32:06.000000000 -0500
 @@ -31,6 +31,7 @@
  		"""
  		self.port = port

Modified: packages/twistedsnmp/trunk/debian/patches/like_v1_no_obj-zenoss_patch03.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/twistedsnmp/trunk/debian/patches/like_v1_no_obj-zenoss_patch03.dpatch?rev=2183&op=diff
==============================================================================
--- packages/twistedsnmp/trunk/debian/patches/like_v1_no_obj-zenoss_patch03.dpatch (original)
+++ packages/twistedsnmp/trunk/debian/patches/like_v1_no_obj-zenoss_patch03.dpatch Thu Apr 26 15:13:39 2007
@@ -6,8 +6,9 @@
 ## DP: See http://dev.zenoss.org/trac/browser/trunk/inst/externallibs/TwistedSNMP-0.3.13.patch03
 
 @DPATCH@
---- v3/agentproxy.py	2006-08-08 09:39:11.000000000 -0400
-+++ v3/agentproxy.py	2006-08-15 14:57:34.000000000 -0400
+diff -urNad trunk~/v3/agentproxy.py trunk/v3/agentproxy.py
+--- trunk~/v3/agentproxy.py	2006-08-08 09:39:11.000000000 -0400
++++ trunk/v3/agentproxy.py	2006-08-15 14:57:34.000000000 -0400
 @@ -328,7 +328,8 @@
  			return [
  				(OID(a),b.getTerminal().get())

Modified: packages/twistedsnmp/trunk/debian/patches/pkt_id_correlate-zenoss_patch02.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/twistedsnmp/trunk/debian/patches/pkt_id_correlate-zenoss_patch02.dpatch?rev=2183&op=diff
==============================================================================
--- packages/twistedsnmp/trunk/debian/patches/pkt_id_correlate-zenoss_patch02.dpatch (original)
+++ packages/twistedsnmp/trunk/debian/patches/pkt_id_correlate-zenoss_patch02.dpatch Thu Apr 26 15:13:39 2007
@@ -8,8 +8,9 @@
 ## DP: See http://dev.zenoss.org/trac/browser/trunk/inst/externallibs/TwistedSNMP-0.3.13.patch02
 
 @DPATCH@
---- v3/agentproxy.py.~2~	2006-05-03 09:23:26.000000000 -0400
-+++ v3/agentproxy.py	2006-05-15 10:36:21.000000000 -0400
+diff -urNad trunk~/v3/agentproxy.py trunk/v3/agentproxy.py
+--- trunk~/v3/agentproxy.py	2006-05-03 09:23:26.000000000 -0400
++++ trunk~/v3/agentproxy.py	2006-05-15 10:36:21.000000000 -0400
 @@ -284,9 +284,8 @@
  			if request is not None:
  				# this is hacky, initialValue is the incrementer for the global value

Modified: packages/twistedsnmp/trunk/debian/patches/timeout_leak-zenoss_patch04.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/twistedsnmp/trunk/debian/patches/timeout_leak-zenoss_patch04.dpatch?rev=2183&op=diff
==============================================================================
--- packages/twistedsnmp/trunk/debian/patches/timeout_leak-zenoss_patch04.dpatch (original)
+++ packages/twistedsnmp/trunk/debian/patches/timeout_leak-zenoss_patch04.dpatch Thu Apr 26 15:13:39 2007
@@ -6,8 +6,9 @@
 ## DP: See http://dev.zenoss.org/trac/browser/trunk/inst/externallibs/TwistedSNMP-0.3.13.patch04
 
 @DPATCH@
---- tableretriever.py	2006-03-23 17:38:00.000000000 -0500
-+++ tableretriever.py.new	2007-02-13 10:42:10.000000000 -0500
+diff -urNad trunk~/tableretriever.py trunk/tableretriever.py
+--- trunk~/tableretriever.py	2006-03-23 17:38:00.000000000 -0500
++++ trunk/tableretriever.py	2007-02-13 10:42:10.000000000 -0500
 @@ -246,12 +246,12 @@
  		"""
  		if not df.called:

Modified: packages/twistedsnmp/trunk/debian/patches/unique_id-zenoss_patch01.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/twistedsnmp/trunk/debian/patches/unique_id-zenoss_patch01.dpatch?rev=2183&op=diff
==============================================================================
--- packages/twistedsnmp/trunk/debian/patches/unique_id-zenoss_patch01.dpatch (original)
+++ packages/twistedsnmp/trunk/debian/patches/unique_id-zenoss_patch01.dpatch Thu Apr 26 15:13:39 2007
@@ -6,8 +6,9 @@
 ## DP: See http://dev.zenoss.org/trac/browser/trunk/inst/externallibs/TwistedSNMP-0.3.13.patch01
 
 @DPATCH@
---- snmpprotocol.py.~1~	2006-03-23 16:54:51.000000000 -0500
-+++ snmpprotocol.py	2006-05-15 10:34:58.000000000 -0400
+diff -urNad trunk~/snmpprotocol.py trunk/snmpprotocol.py
+--- trunk~/snmpprotocol.py	2006-03-23 16:54:51.000000000 -0500
++++ trunk/snmpprotocol.py	2006-05-15 10:34:58.000000000 -0400
 @@ -145,7 +145,7 @@
  					key, log.getException(err),
  				)