[Pkg-zenoss-commits] r331 - in /trunk/packages/zenoss/debian: patches/00list patches/ZENHOME90-Products.dpatch patches/python2.4-only.dpatch rules
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Fri Nov 30 19:26:55 UTC 2007
Author: bzed-guest
Date: Fri Nov 30 19:26:55 2007
New Revision: 331
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=331
Log:
more patch updates
Added:
trunk/packages/zenoss/debian/patches/python2.4-only.dpatch (with props)
Modified:
trunk/packages/zenoss/debian/patches/00list
trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch
trunk/packages/zenoss/debian/rules
Modified: trunk/packages/zenoss/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/00list?rev=331&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/00list (original)
+++ trunk/packages/zenoss/debian/patches/00list Fri Nov 30 19:26:55 2007
@@ -10,3 +10,4 @@
renderserver-cache-dir
zendmd_history_location
pysnmp-v3-env
+python2.4-only
Modified: trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch?rev=331&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME90-Products.dpatch Fri Nov 30 19:26:55 2007
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad zenoss~/Products/ZenModel/help/Administration.stx zenoss/Products/ZenModel/help/Administration.stx
--- zenoss~/Products/ZenModel/help/Administration.stx 2004-05-18 22:37:04.000000000 +0200
-+++ zenoss/Products/ZenModel/help/Administration.stx 2007-11-30 19:02:46.000000000 +0100
++++ zenoss/Products/ZenModel/help/Administration.stx 2007-11-30 20:18:12.000000000 +0100
@@ -5,7 +5,7 @@
Environment
@@ -17,9 +17,17 @@
<p>SYBASE - path to the sybase install used to connect to netcool. Normally this is set automatically based on ZENHOME</p>
<p>ORACLE_HOME - path to the oracle client install used to connect to the netcool history database.</p>
+diff -urNad zenoss~/Products/ZenReports/ReportMail.py zenoss/Products/ZenReports/ReportMail.py
+--- zenoss~/Products/ZenReports/ReportMail.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenReports/ReportMail.py 2007-11-30 20:18:32.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
diff -urNad zenoss~/Products/ZenUtils/Utils.py zenoss/Products/ZenUtils/Utils.py
--- zenoss~/Products/ZenUtils/Utils.py 2007-11-30 16:01:46.000000000 +0100
-+++ zenoss/Products/ZenUtils/Utils.py 2007-11-30 19:02:46.000000000 +0100
++++ zenoss/Products/ZenUtils/Utils.py 2007-11-30 20:18:12.000000000 +0100
@@ -21,6 +21,7 @@
import sys
@@ -39,7 +47,7 @@
"""
diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
--- zenoss~/Products/ZenUtils/ZenBackup.py 2007-11-30 16:01:46.000000000 +0100
-+++ zenoss/Products/ZenUtils/ZenBackup.py 2007-11-30 19:02:46.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenBackup.py 2007-11-30 20:18:12.000000000 +0100
@@ -125,7 +125,7 @@
default=None,
help='File to backup to.'
@@ -51,7 +59,7 @@
default=False,
diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
--- zenoss~/Products/ZenUtils/zenpack.py 2007-11-30 16:01:46.000000000 +0100
-+++ zenoss/Products/ZenUtils/zenpack.py 2007-11-30 19:02:46.000000000 +0100
++++ zenoss/Products/ZenUtils/zenpack.py 2007-11-30 20:18:12.000000000 +0100
@@ -275,7 +275,7 @@
action="store_true",
default=False,
Added: trunk/packages/zenoss/debian/patches/python2.4-only.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/python2.4-only.dpatch?rev=331&op=file
==============================================================================
--- trunk/packages/zenoss/debian/patches/python2.4-only.dpatch (added)
+++ trunk/packages/zenoss/debian/patches/python2.4-only.dpatch Fri Nov 30 19:26:55 2007
@@ -1,0 +1,439 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## python2.4-only.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad zenoss~/Products/ZenEvents/EventServer.py zenoss/Products/ZenEvents/EventServer.py
+--- zenoss~/Products/ZenEvents/EventServer.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenEvents/EventServer.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''EventServer
+
+diff -urNad zenoss~/Products/ZenEvents/MailProcessor.py zenoss/Products/ZenEvents/MailProcessor.py
+--- zenoss~/Products/ZenEvents/MailProcessor.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenEvents/MailProcessor.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ import email, socket, rfc822, types
+ import calendar
+diff -urNad zenoss~/Products/ZenEvents/Schedule.py zenoss/Products/ZenEvents/Schedule.py
+--- zenoss~/Products/ZenEvents/Schedule.py 2007-04-20 15:25:38.000000000 +0200
++++ zenoss/Products/ZenEvents/Schedule.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''Schedule
+
+diff -urNad zenoss~/Products/ZenEvents/SyslogProcessing.py zenoss/Products/ZenEvents/SyslogProcessing.py
+--- zenoss~/Products/ZenEvents/SyslogProcessing.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenEvents/SyslogProcessing.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''SyslogProcessing
+
+diff -urNad zenoss~/Products/ZenEvents/xtest.py zenoss/Products/ZenEvents/xtest.py
+--- zenoss~/Products/ZenEvents/xtest.py 2007-06-05 15:19:35.000000000 +0200
++++ zenoss/Products/ZenEvents/xtest.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''xtest.py
+
+diff -urNad zenoss~/Products/ZenEvents/zenactions.py zenoss/Products/ZenEvents/zenactions.py
+--- zenoss~/Products/ZenEvents/zenactions.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenEvents/zenactions.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''zenactions
+
+diff -urNad zenoss~/Products/ZenEvents/zenmail.py zenoss/Products/ZenEvents/zenmail.py
+--- zenoss~/Products/ZenEvents/zenmail.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenEvents/zenmail.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ # Notes: database wants events in UTC time
+ # Events page shows local time, as determined on the server where zenoss runs
+
+diff -urNad zenoss~/Products/ZenEvents/zenpop3.py zenoss/Products/ZenEvents/zenpop3.py
+--- zenoss~/Products/ZenEvents/zenpop3.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenEvents/zenpop3.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ # Notes: database wants events in UTC time
+ # Events page shows local time, as determined on the server where zenoss runs
+
+diff -urNad zenoss~/Products/ZenEvents/zensyslog.py zenoss/Products/ZenEvents/zensyslog.py
+--- zenoss~/Products/ZenEvents/zensyslog.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenEvents/zensyslog.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''zensyslog
+
+diff -urNad zenoss~/Products/ZenEvents/zentrap.py zenoss/Products/ZenEvents/zentrap.py
+--- zenoss~/Products/ZenEvents/zentrap.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenEvents/zentrap.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''zentrap
+
+diff -urNad zenoss~/Products/ZenHub/PBDaemon.py zenoss/Products/ZenHub/PBDaemon.py
+--- zenoss~/Products/ZenHub/PBDaemon.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenHub/PBDaemon.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+@@ -10,7 +11,6 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#!/usr/bin/python
+
+ __doc__='''PBDaemon
+
+diff -urNad zenoss~/Products/ZenHub/pbClient.py zenoss/Products/ZenHub/pbClient.py
+--- zenoss~/Products/ZenHub/pbClient.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenHub/pbClient.py 2007-11-30 20:24:54.000000000 +0100
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+
+-#! /usr/bin/python
++#! /usr/bin/env python2.4
+
+ from twisted.spread import pb
+ from twisted.internet import reactor
+diff -urNad zenoss~/Products/ZenHub/pbClient3.py zenoss/Products/ZenHub/pbClient3.py
+--- zenoss~/Products/ZenHub/pbClient3.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenHub/pbClient3.py 2007-11-30 20:24:54.000000000 +0100
+@@ -11,7 +11,7 @@
+ #
+ ###########################################################################
+
+-#! /usr/bin/python
++#! /usr/bin/env python2.4
+
+ from twisted.spread import pb
+ from twisted.internet import reactor
+diff -urNad zenoss~/Products/ZenHub/services/EventService.py zenoss/Products/ZenHub/services/EventService.py
+--- zenoss~/Products/ZenHub/services/EventService.py 2007-10-08 16:24:16.000000000 +0200
++++ zenoss/Products/ZenHub/services/EventService.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ from twisted.spread import pb
+
+diff -urNad zenoss~/Products/ZenHub/services/ProcessConfig.py zenoss/Products/ZenHub/services/ProcessConfig.py
+--- zenoss~/Products/ZenHub/services/ProcessConfig.py 2007-08-15 20:40:59.000000000 +0200
++++ zenoss/Products/ZenHub/services/ProcessConfig.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ from PerformanceConfig import PerformanceConfig
+ from ZODB.POSException import POSError
+diff -urNad zenoss~/Products/ZenHub/services/StatusConfig.py zenoss/Products/ZenHub/services/StatusConfig.py
+--- zenoss~/Products/ZenHub/services/StatusConfig.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenHub/services/StatusConfig.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ from Products.ZenHub.HubService import HubService
+
+diff -urNad zenoss~/Products/ZenHub/services/XmlRPCConfig.py zenoss/Products/ZenHub/services/XmlRPCConfig.py
+--- zenoss~/Products/ZenHub/services/XmlRPCConfig.py 2007-04-20 15:25:38.000000000 +0200
++++ zenoss/Products/ZenHub/services/XmlRPCConfig.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ from PerformanceConfig import PerformanceConfig
+
+diff -urNad zenoss~/Products/ZenHub/services/ZenRender.py zenoss/Products/ZenHub/services/ZenRender.py
+--- zenoss~/Products/ZenHub/services/ZenRender.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenHub/services/ZenRender.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ from Products.ZenHub.HubService import HubService
+ from twisted.web import resource, server
+diff -urNad zenoss~/Products/ZenHub/services/__init__.py zenoss/Products/ZenHub/services/__init__.py
+--- zenoss~/Products/ZenHub/services/__init__.py 2007-04-25 21:01:19.000000000 +0200
++++ zenoss/Products/ZenHub/services/__init__.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ ""
+
+diff -urNad zenoss~/Products/ZenHub/zenhub.py zenoss/Products/ZenHub/zenhub.py
+--- zenoss~/Products/ZenHub/zenhub.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenHub/zenhub.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+diff -urNad zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py
+--- zenoss~/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-06-05 15:19:35.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+@@ -10,7 +11,6 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#!/usr/bin/python
+ import os
+ for d, dirs, filenames in os.walk(os.path.join(os.environ['ZENHOME'], 'perf')):
+ for f in filenames:
+diff -urNad zenoss~/Products/ZenModel/tests/devicePopulator.py zenoss/Products/ZenModel/tests/devicePopulator.py
+--- zenoss~/Products/ZenModel/tests/devicePopulator.py 2007-11-20 15:04:48.000000000 +0100
++++ zenoss/Products/ZenModel/tests/devicePopulator.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''devicePopulator
+
+diff -urNad zenoss~/Products/ZenRRD/FileCleanup.py zenoss/Products/ZenRRD/FileCleanup.py
+--- zenoss~/Products/ZenRRD/FileCleanup.py 2007-04-20 15:25:38.000000000 +0200
++++ zenoss/Products/ZenRRD/FileCleanup.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''FileCleanup
+
+diff -urNad zenoss~/Products/ZenRRD/RRDDaemon.py zenoss/Products/ZenRRD/RRDDaemon.py
+--- zenoss~/Products/ZenRRD/RRDDaemon.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenRRD/RRDDaemon.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+diff -urNad zenoss~/Products/ZenRRD/SnmpDaemon.py zenoss/Products/ZenRRD/SnmpDaemon.py
+--- zenoss~/Products/ZenRRD/SnmpDaemon.py 2007-05-15 16:34:44.000000000 +0200
++++ zenoss/Products/ZenRRD/SnmpDaemon.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''SnmpDaemon
+
+diff -urNad zenoss~/Products/ZenRRD/zenperfsnmp.py zenoss/Products/ZenRRD/zenperfsnmp.py
+--- zenoss~/Products/ZenRRD/zenperfsnmp.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenRRD/zenperfsnmp.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+diff -urNad zenoss~/Products/ZenRRD/zenprocess.py zenoss/Products/ZenRRD/zenprocess.py
+--- zenoss~/Products/ZenRRD/zenprocess.py 2007-11-30 16:01:46.000000000 +0100
++++ zenoss/Products/ZenRRD/zenprocess.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+diff -urNad zenoss~/Products/ZenRRD/zenrender.py zenoss/Products/ZenRRD/zenrender.py
+--- zenoss~/Products/ZenRRD/zenrender.py 2007-11-20 15:04:48.000000000 +0100
++++ zenoss/Products/ZenRRD/zenrender.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+diff -urNad zenoss~/Products/ZenRRD/zenx.py zenoss/Products/ZenRRD/zenx.py
+--- zenoss~/Products/ZenRRD/zenx.py 2007-11-20 15:04:48.000000000 +0100
++++ zenoss/Products/ZenRRD/zenx.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/python
++#! /usr/bin/env python2.4
+
+ __doc__='''zenx.py
+
+diff -urNad zenoss~/Products/ZenReports/ReportRunner.py zenoss/Products/ZenReports/ReportRunner.py
+--- zenoss~/Products/ZenReports/ReportRunner.py 2007-05-15 21:18:51.000000000 +0200
++++ zenoss/Products/ZenReports/ReportRunner.py 2007-11-30 20:25:11.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+@@ -10,7 +11,6 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#!/usr/bin/env python
+
+ import Globals
+ from Products.ZenUtils.ZCmdBase import ZCmdBase
+diff -urNad zenoss~/Products/ZenUtils/Chain.py zenoss/Products/ZenUtils/Chain.py
+--- zenoss~/Products/ZenUtils/Chain.py 2007-04-20 15:25:38.000000000 +0200
++++ zenoss/Products/ZenUtils/Chain.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''Chain
+
+diff -urNad zenoss~/Products/ZenUtils/Driver.py zenoss/Products/ZenUtils/Driver.py
+--- zenoss~/Products/ZenUtils/Driver.py 2007-04-20 15:25:38.000000000 +0200
++++ zenoss/Products/ZenUtils/Driver.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''Driver.py
+
+diff -urNad zenoss~/Products/ZenUtils/NJobs.py zenoss/Products/ZenUtils/NJobs.py
+--- zenoss~/Products/ZenUtils/NJobs.py 2007-04-20 15:25:38.000000000 +0200
++++ zenoss/Products/ZenUtils/NJobs.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+
+ __doc__='''NJobs
+
+diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
+--- zenoss~/Products/ZenUtils/ZenBackup.py 2007-11-30 20:24:53.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenBackup.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+diff -urNad zenoss~/Products/ZenUtils/ZenBackupBase.py zenoss/Products/ZenUtils/ZenBackupBase.py
+--- zenoss~/Products/ZenUtils/ZenBackupBase.py 2007-11-20 15:04:48.000000000 +0100
++++ zenoss/Products/ZenUtils/ZenBackupBase.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+diff -urNad zenoss~/Products/ZenUtils/ZenRestore.py zenoss/Products/ZenUtils/ZenRestore.py
+--- zenoss~/Products/ZenUtils/ZenRestore.py 2007-06-04 21:32:10.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenRestore.py 2007-11-30 20:24:54.000000000 +0100
+@@ -1,4 +1,4 @@
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ ###########################################################################
+ #
+ # This program is part of Zenoss Core, an open source monitoring platform.
+diff -urNad zenoss~/Products/ZenUtils/zproprmlocal.py zenoss/Products/ZenUtils/zproprmlocal.py
+--- zenoss~/Products/ZenUtils/zproprmlocal.py 2007-05-15 21:18:51.000000000 +0200
++++ zenoss/Products/ZenUtils/zproprmlocal.py 2007-11-30 20:24:54.000000000 +0100
+@@ -10,7 +10,7 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #
+ ###########################################################################
+-#! /usr/bin/env python
++#! /usr/bin/env python2.4
+ __doc__ = "Remove local value of zProperty from Devices"
+
+ import Globals
Propchange: trunk/packages/zenoss/debian/patches/python2.4-only.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/zenoss/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules?rev=331&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules (original)
+++ trunk/packages/zenoss/debian/rules Fri Nov 30 19:26:55 2007
@@ -81,7 +81,7 @@
dh_testroot
dh_clean -k -i
dh_installdirs -i
- dh_install -i -Nzenoss
+ #dh_install -i -Nzenoss
cp -pr /usr/lib/$(ZOPE)/skel $(CURDIR)/debian/zenoss/usr/share/zenoss
rm -f $(CURDIR)/debian/zenoss/usr/share/zenoss/skel/import/*.zexp
More information about the Pkg-zenoss-commits
mailing list