[Pkg-zenoss-commits] r229 - in /packages/zenoss/trunk/debian: patches/00list patches/ZenossInfo-rrd-version.dpatch patches/pysnmp-v3-env.dpatch rules

Tue Jul 10 19:57:35 UTC 2007

Author: bzed-guest
Date: Tue Jul 10 19:57:35 2007
New Revision: 229

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=229
Log:
adding some new patches...

Added:
    packages/zenoss/trunk/debian/patches/ZenossInfo-rrd-version.dpatch   (with props)
    packages/zenoss/trunk/debian/patches/pysnmp-v3-env.dpatch   (with props)
Modified:
    packages/zenoss/trunk/debian/patches/00list
    packages/zenoss/trunk/debian/rules

Modified: packages/zenoss/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/00list?rev=229&op=diff
==============================================================================

--- packages/zenoss/trunk/debian/patches/00list (original)
+++ packages/zenoss/trunk/debian/patches/00list Tue Jul 10 19:57:35 2007
@@ -13,3 +13,4 @@
 ZENHOME60-rm-extra-check-in-zenbuild
 ZENHOME90-rest-Products
 bin-zenoss-fix
+ZenossInfo-rrd-version

Added: packages/zenoss/trunk/debian/patches/ZenossInfo-rrd-version.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/ZenossInfo-rrd-version.dpatch?rev=229&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/ZenossInfo-rrd-version.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/ZenossInfo-rrd-version.dpatch Tue Jul 10 19:57:35 2007
@@ -1,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ZenossInfo-rrd-version.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: there's no need for us to install rrdtool, so let's use the version
+## DP: of python-rrd, which is a dependency.
+
+ at DPATCH@
+diff -urNad zenoss~/Products/ZenModel/ZenossInfo.py zenoss/Products/ZenModel/ZenossInfo.py
+--- zenoss~/Products/ZenModel/ZenossInfo.py	2007-07-10 20:24:17.000000000 +0200
++++ zenoss/Products/ZenModel/ZenossInfo.py	2007-07-10 20:34:15.000000000 +0200
+@@ -179,13 +179,11 @@
+             v = Version(*getRRDToolVersion())
+             v.full()
+         """
+-        cmd = os.path.join(pwd.getpwnam('zenoss')[5], 'bin', 'rrdtool')
+-        if not os.path.exists(cmd):
+-            cmd = 'rrdtool'
+-        fd = os.popen(cmd)
+-        output = fd.readlines()[0].strip()
++        name = 'python-rrd'
++        fd = os.popen('/usr/bin/dpkg -s %s' % name)
++        output = fd.read()
+         fd.close()
+-        name, version = output.split()[:2]
++        version = re.findall(r'^Version: (.*)$', output, re.M)[0]
+         major, minor, micro = getVersionTupleFromString(version)
+         return Version(name, major, minor, micro)
+ 

Propchange: packages/zenoss/trunk/debian/patches/ZenossInfo-rrd-version.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/zenoss/trunk/debian/patches/pysnmp-v3-env.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/pysnmp-v3-env.dpatch?rev=229&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/pysnmp-v3-env.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/pysnmp-v3-env.dpatch Tue Jul 10 19:57:35 2007
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pysnmp-v3-env.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: see /usr/share/doc/python-pysnmp-se/README.Debian
+
+ at DPATCH@
+diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
+--- zenoss~/bin/zenfunctions	2007-07-10 21:33:08.000000000 +0200
++++ zenoss/bin/zenfunctions	2007-07-10 21:34:03.000000000 +0200
+@@ -27,6 +27,9 @@
+ VARDIR=$ZENHOME/var
+ CFGDIR=$ZENHOME/etc
+ 
++PYSNMP_API_VERSION='v3'
++export PYSNMP_API_VERSION
++
+ ZENPRODUCTS="ZenModel NcoProduct ZenUtils SiteScopeParser ZenRelations ZenStatus SnmpCollector ZenRRD DataCollector ZenWidgets ZenEvents"
+ 
+ SYS=`uname`

Propchange: packages/zenoss/trunk/debian/patches/pysnmp-v3-env.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/zenoss/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules?rev=229&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules (original)
+++ packages/zenoss/trunk/debian/rules Tue Jul 10 19:57:35 2007
@@ -91,6 +91,13 @@
 		-Xzenoss_init_post -Xzenoss_init_pre -Xzenoss_upgrade_post \
 		-Xzenoss_upgrade_pre -Xzenctl -Xzeneventbuild
 
+	#we should use pysnmp-se within the zope apps, too:
+	sed -i '2 iPYSNMP_API_VERSION="v3"; export PYSNMP_API_VERSION' \
+               $(CURDIR)/debian/zenoss/usr/lib/zenoss/skel/bin/zopectl.in
+
+	chmod 755 $(CURDIR)/debian/zenoss/usr/share/zope/Products/ZenUITests/tests/selenium/{t,T}*.py
+	chmod 755 $(CURDIR)/debian/zenoss/usr/share/zope/Products/ZenUtils/ZenBackupBase.py
+
 binary-arch: build-arch install-arch
 	dh_testdir
 	dh_testroot


