[Pkg-zenoss-commits] r350 - in /trunk/packages/pynetsnmp/debian: changelog control patches/ patches/00dpatch.conf patches/examples-import-fix.dpatch rules

bzed at users.alioth.debian.org bzed at users.alioth.debian.org
Fri Dec 14 21:50:32 UTC 2007 

Author: bzed
Date: Fri Dec 14 21:50:32 2007
New Revision: 350

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=350
Log:
* Medium urgency as requested by the RMs.
  - Adding dpatch to the build dependencies.
* debian/patches:
  - Adding examples-import-fix.dpatch to make the test files working as
    examples.

Added:
    trunk/packages/pynetsnmp/debian/patches/
    trunk/packages/pynetsnmp/debian/patches/00dpatch.conf
    trunk/packages/pynetsnmp/debian/patches/examples-import-fix.dpatch   (with props)
Modified:
    trunk/packages/pynetsnmp/debian/changelog
    trunk/packages/pynetsnmp/debian/control
    trunk/packages/pynetsnmp/debian/rules

Modified: trunk/packages/pynetsnmp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/pynetsnmp/debian/changelog?rev=350&op=diff
==============================================================================
--- trunk/packages/pynetsnmp/debian/changelog (original)
+++ trunk/packages/pynetsnmp/debian/changelog Fri Dec 14 21:50:32 2007
@@ -1,16 +1,20 @@
 pynetsnmp (0.28.0-1) unstable; urgency=medium
 
   * New upstream version.
+  * Medium urgency as requested by the RMs.
   * debian/control:
     - Updating my email address.
     - Updating Standards-Version to 3.7.3.
+    - Adding dpatch to the build dependencies.
   * debian/examples:
     - Including test/* as examples.
-  * Medium urgency as requested by the RMs.
   * debian/libdeps:
     - Relaxing libsnmp dependency to the current SONAME.
+  * debian/patches:
+    - Adding examples-import-fix.dpatch to make the test files working as
+      examples.
 
- -- Bernd Zeimetz <bzed at debian.org>  Fri, 14 Dec 2007 22:36:11 +0100
+ -- Bernd Zeimetz <bzed at debian.org>  Fri, 14 Dec 2007 22:47:52 +0100
 
 pynetsnmp (0.27.0-1) unstable; urgency=low
 

Modified: trunk/packages/pynetsnmp/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/pynetsnmp/debian/control?rev=350&op=diff
==============================================================================
--- trunk/packages/pynetsnmp/debian/control (original)
+++ trunk/packages/pynetsnmp/debian/control Fri Dec 14 21:50:32 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Zenoss Packaging Team <pkg-zenoss-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 5), python
+Build-Depends: debhelper (>= 5), python, dpatch
 Build-Depends-Indep: libsnmp-dev, python-support (>= 0.4)
 Vcs-Svn: svn://svn.debian.org/svn/pkg-zenoss/packages/pynetsnmp/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-zenoss/packages/pynetsnmp/trunk/

Added: trunk/packages/pynetsnmp/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/pynetsnmp/debian/patches/00dpatch.conf?rev=350&op=file
==============================================================================
--- trunk/packages/pynetsnmp/debian/patches/00dpatch.conf (added)
+++ trunk/packages/pynetsnmp/debian/patches/00dpatch.conf Fri Dec 14 21:50:32 2007
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

Added: trunk/packages/pynetsnmp/debian/patches/examples-import-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/pynetsnmp/debian/patches/examples-import-fix.dpatch?rev=350&op=file
==============================================================================
--- trunk/packages/pynetsnmp/debian/patches/examples-import-fix.dpatch (added)
+++ trunk/packages/pynetsnmp/debian/patches/examples-import-fix.dpatch Fri Dec 14 21:50:32 2007
@@ -1,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## examples-import-fix.dpatch by Bernd Zeimetz <bzed at debian.org>
+##
+## DP: Fixiing tests to work as example
+
+ at DPATCH@
+diff -urNad pynetsnmp~/test/get.py pynetsnmp/test/get.py
+--- pynetsnmp~/test/get.py	2007-10-29 18:17:44.000000000 +0100
++++ pynetsnmp/test/get.py	2007-12-14 22:46:49.000000000 +0100
+@@ -1,5 +1,5 @@
+-import netsnmp
+-import twistedsnmp
++from pynetsnmp import netsnmp
++from pynetsnmp import twistedsnmp
+ import sys
+ 
+ from twisted.internet import reactor
+diff -urNad pynetsnmp~/test/getbulk.py pynetsnmp/test/getbulk.py
+--- pynetsnmp~/test/getbulk.py	2007-10-29 18:17:44.000000000 +0100
++++ pynetsnmp/test/getbulk.py	2007-12-14 22:46:44.000000000 +0100
+@@ -1,5 +1,5 @@
+-import netsnmp
+-import twistedsnmp
++from pynetsnmp import netsnmp
++from pynetsnmp import twistedsnmp
+ import sys
+ 
+ from twisted.internet import reactor
+diff -urNad pynetsnmp~/test/trap.py pynetsnmp/test/trap.py
+--- pynetsnmp~/test/trap.py	2007-10-30 14:30:19.000000000 +0100
++++ pynetsnmp/test/trap.py	2007-12-14 22:47:02.000000000 +0100
+@@ -1,8 +1,8 @@
+-import netsnmp
++from pynetsnmp import netsnmp
+ from ctypes import *
+ from CONSTANTS import *
+ 
+-import twistedsnmp
++from pynetsnmp import twistedsnmp
+ from twisted.internet import reactor, defer
+ 
+ def translateOid(oid):
+diff -urNad pynetsnmp~/test/twistget.py pynetsnmp/test/twistget.py
+--- pynetsnmp~/test/twistget.py	2007-04-07 20:48:28.000000000 +0200
++++ pynetsnmp/test/twistget.py	2007-12-14 22:47:16.000000000 +0100
+@@ -1,4 +1,4 @@
+-from twistedsnmp import AgentProxy
++from pynetsnmp.twistedsnmp import AgentProxy
+ from twisted.python import failure
+ from twisted.internet import reactor
+ 
+diff -urNad pynetsnmp~/test/walk.py pynetsnmp/test/walk.py
+--- pynetsnmp~/test/walk.py	2007-10-29 18:17:44.000000000 +0100
++++ pynetsnmp/test/walk.py	2007-12-14 22:47:23.000000000 +0100
+@@ -1,5 +1,5 @@
+-import netsnmp
+-import twistedsnmp
++from pynetsnmp import netsnmp
++from pynetsnmp import twistedsnmp
+ import sys
+ 
+ from twisted.internet import reactor, defer

Propchange: trunk/packages/pynetsnmp/debian/patches/examples-import-fix.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/pynetsnmp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/pynetsnmp/debian/rules?rev=350&op=diff
==============================================================================
--- trunk/packages/pynetsnmp/debian/rules (original)
+++ trunk/packages/pynetsnmp/debian/rules Fri Dec 14 21:50:32 2007
@@ -5,16 +5,18 @@
 
 PKGNAME:=python-pynetsnmp
 
+include /usr/share/dpatch/dpatch.make
 
 build: build-stamp
-build-stamp:
+build-stamp: patch
 	dh_testdir
 
 	python setup.py build
 
 	touch $@
 
-clean: 
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f install-stamp build-stamp
@@ -52,5 +54,5 @@
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean-patched

More information about the Pkg-zenoss-commits mailing list