[Pkg-zenoss-commits] r270 - in /trunk/packages/zenoss/debian: ./ patches/

bzed-guest at users.alioth.debian.org bzed-guest at users.alioth.debian.org
Wed Aug 8 18:41:48 UTC 2007 

Author: bzed-guest
Date: Wed Aug  8 18:41:48 2007
New Revision: 270

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=270
Log:
moving to zope2.10 and zenoss 2.0.4
hope everythign works well with zope 2.10

Added:
    trunk/packages/zenoss/debian/patches/zope2.10-zenmodel-report.dpatch   (with props)
Modified:
    trunk/packages/zenoss/debian/changelog
    trunk/packages/zenoss/debian/control
    trunk/packages/zenoss/debian/patches/00list
    trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch
    trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch
    trunk/packages/zenoss/debian/rules
    trunk/packages/zenoss/debian/rules-extras.mk
    trunk/packages/zenoss/debian/zenoss-doc.install
    trunk/packages/zenoss/debian/zenoss-revisions
    trunk/packages/zenoss/debian/zenoss.dzinstance
    trunk/packages/zenoss/debian/zenoss.dzproduct.DataCollector
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenEvents
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenHub
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenModel
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRRD
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRelations
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenReports
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenStatus
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestCase
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestRunner
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUITests
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUtils
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWidgets
    trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWin
    trunk/packages/zenoss/debian/zenoss.postinst
    trunk/packages/zenoss/debian/zenoss.prerm

Modified: trunk/packages/zenoss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/changelog?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/changelog (original)
+++ trunk/packages/zenoss/debian/changelog Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
-zenoss (2.0.3-1) UNRELEASED; urgency=low
+zenoss (2.0.4-0) UNRELEASED; urgency=low
 
   * Initial release (Closes: #361253)
 

Modified: trunk/packages/zenoss/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/control?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/control (original)
+++ trunk/packages/zenoss/debian/control Wed Aug  8 18:41:48 2007
@@ -4,14 +4,14 @@
 Maintainer: Zenoss Packaging Team <pkg-zenoss-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bernd at bzed.de>, Stefano Zacchiroli <zack at debian.org>, Fabio Tranchitella <kobold at debian.org>
 Build-Depends: debhelper (>= 5), dpatch, xsltproc, docbook-xsl, docbook-xml,
- zope-debhelper (>= 0.3.10), python, python-support (>= 0.5.3), zope2.9 (>= 2.9.7-3), python-setuptools (>= 0.6c3-1)
+ zope-debhelper (>= 0.3.10), python, python-support (>= 0.5.3), zope2.10 (>= 2.10.4), python-setuptools (>= 0.6c3-1)
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-zenoss/packages/zenoss/trunk
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/
 Standards-Version: 3.7.2
 
 Package: zenoss
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, ${zope:Depends},
+Depends: ${python:Depends}, ${misc:Depends}, 
  adduser, dbconfig-common (>= 1.8.35), snmp, rsync,
  python-elementtree (>= 1.2.6), python-epydoc (>= 2.1),
  python-mysqldb (>= 1.2.0), python-pyip,
@@ -19,8 +19,10 @@
  python-rrd, python-twisted (>= 2.5.0),
  python-pynetsnmp (>=0.26.4), python-wmi (>= 1:0.1.3),
  python-twill (>= 0.8.5), python-twisted-snmp, yapps2 (>= 2.1.1),
+ zope2.10 (>= 2.10.4), zope-common (>= 0.5.37),
  zope-advancedquery, zope-managableindex,
- zope-cmfcore1.6, zope-genericsetup, zope-pas, zope-pluginregistry,
+ zope-cmfcore1.6 (>= 1.6.4), zope-genericsetup, zope-pas,
+ zope-pluginregistry (>= 1.1.2-2),
  zenoss-zensocket, mysql-client-5.0 (>= 5.0.22),
  libsmi2, libsmi2-common
 Recommends: mysql-server-5.0 (>= 5.0.22), sendpage-server, snmpd

Modified: trunk/packages/zenoss/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/00list?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/00list (original)
+++ trunk/packages/zenoss/debian/patches/00list Wed Aug  8 18:41:48 2007
@@ -15,3 +15,4 @@
 bin-zenoss-fix
 ZenossInfo-rrd-version
 renderserver-cache-dir
+zope2.10-zenmodel-report

Modified: trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch Wed Aug  8 18:41:48 2007
@@ -16,7 +16,7 @@
 -if [ -d /usr/lib/zope ] ; then
 -   ZOPEHOME=/usr/lib/zope
 -fi
-+ZOPEHOME=/usr/lib/zope2.9
++ZOPEHOME=/usr/lib/zope2.10
  
 -PYTHON=$ZOPEHOME/bin/python
 +PYTHON=/usr/bin/python2.4

Modified: trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME20-import-os.dpatch Wed Aug  8 18:41:48 2007
@@ -8,7 +8,7 @@
 @DPATCH@
 diff -urNad zenoss~/Products/ZenEvents/zensendsyslog.py zenoss/Products/ZenEvents/zensendsyslog.py
 --- zenoss~/Products/ZenEvents/zensendsyslog.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensendsyslog.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenEvents/zensendsyslog.py	2007-08-08 19:24:30.000000000 +0200
 @@ -11,7 +11,7 @@
  #
  ###########################################################################
@@ -20,7 +20,7 @@
  import Globals
 diff -urNad zenoss~/Products/ZenEvents/zensyslog.py zenoss/Products/ZenEvents/zensyslog.py
 --- zenoss~/Products/ZenEvents/zensyslog.py	2007-07-13 21:03:51.000000000 +0200
-+++ zenoss/Products/ZenEvents/zensyslog.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenEvents/zensyslog.py	2007-08-08 19:24:30.000000000 +0200
 @@ -21,7 +21,7 @@
  
  import time
@@ -31,8 +31,8 @@
  from twisted.internet.protocol import DatagramProtocol
  from twisted.internet import reactor
 diff -urNad zenoss~/Products/ZenHub/zenhub.py zenoss/Products/ZenHub/zenhub.py
---- zenoss~/Products/ZenHub/zenhub.py	2007-05-15 16:32:22.000000000 +0200
-+++ zenoss/Products/ZenHub/zenhub.py	2007-07-22 10:38:06.000000000 +0200
+--- zenoss~/Products/ZenHub/zenhub.py	2007-08-01 16:36:37.000000000 +0200
++++ zenoss/Products/ZenHub/zenhub.py	2007-08-08 19:24:30.000000000 +0200
 @@ -22,7 +22,7 @@
  __version__ = "$Revision$"[11:-2]
  
@@ -43,8 +43,8 @@
  
  from twisted.cred import portal, checkers, error, credentials
 diff -urNad zenoss~/Products/ZenModel/DataRoot.py zenoss/Products/ZenModel/DataRoot.py
---- zenoss~/Products/ZenModel/DataRoot.py	2007-07-22 10:36:55.000000000 +0200
-+++ zenoss/Products/ZenModel/DataRoot.py	2007-07-22 10:38:06.000000000 +0200
+--- zenoss~/Products/ZenModel/DataRoot.py	2007-08-08 19:24:27.000000000 +0200
++++ zenoss/Products/ZenModel/DataRoot.py	2007-08-08 19:24:30.000000000 +0200
 @@ -458,7 +458,7 @@
          pack.organization = organization
          pack.version = version
@@ -67,8 +67,8 @@
              os.system('%s run --remove %s' % (zp, pack))
          self._p_jar.sync()
 diff -urNad zenoss~/Products/ZenModel/DeviceClass.py zenoss/Products/ZenModel/DeviceClass.py
---- zenoss~/Products/ZenModel/DeviceClass.py	2007-07-17 00:24:59.000000000 +0200
-+++ zenoss/Products/ZenModel/DeviceClass.py	2007-07-22 10:38:06.000000000 +0200
+--- zenoss~/Products/ZenModel/DeviceClass.py	2007-08-01 22:48:56.000000000 +0200
++++ zenoss/Products/ZenModel/DeviceClass.py	2007-08-08 19:24:30.000000000 +0200
 @@ -17,7 +17,7 @@
  
  __version__ = "$Revision: 1.76 $"[11:-2]
@@ -80,7 +80,7 @@
  import urllib
 diff -urNad zenoss~/Products/ZenModel/IpNetwork.py zenoss/Products/ZenModel/IpNetwork.py
 --- zenoss~/Products/ZenModel/IpNetwork.py	2007-06-25 19:45:13.000000000 +0200
-+++ zenoss/Products/ZenModel/IpNetwork.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/IpNetwork.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  
  __version__ = "$Revision: 1.22 $"[11:-2]
@@ -101,7 +101,7 @@
                  log.info('Executing command: %s' % zendiscCmd)
 diff -urNad zenoss~/Products/ZenModel/PerformanceConf.py zenoss/Products/ZenModel/PerformanceConf.py
 --- zenoss~/Products/ZenModel/PerformanceConf.py	2007-06-19 21:13:03.000000000 +0200
-+++ zenoss/Products/ZenModel/PerformanceConf.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/PerformanceConf.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  
  __version__ = "$Revision: 1.30 $"[11:-2]
@@ -113,7 +113,7 @@
  import transaction
 diff -urNad zenoss~/Products/ZenModel/ZenModelRM.py zenoss/Products/ZenModel/ZenModelRM.py
 --- zenoss~/Products/ZenModel/ZenModelRM.py	2007-05-03 17:19:41.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenModelRM.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/ZenModelRM.py	2007-08-08 19:24:30.000000000 +0200
 @@ -17,7 +17,7 @@
  
  __version__ = "$Revision: 1.50 $"[11:-2]
@@ -125,7 +125,7 @@
  from DateTime import DateTime
 diff -urNad zenoss~/Products/ZenModel/ZenPack.py zenoss/Products/ZenModel/ZenPack.py
 --- zenoss~/Products/ZenModel/ZenPack.py	2007-07-17 21:11:16.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPack.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPack.py	2007-08-08 19:24:30.000000000 +0200
 @@ -24,7 +24,7 @@
  
  import transaction
@@ -136,8 +136,8 @@
  __doc__="ZenPacks base definitions"
  
 diff -urNad zenoss~/Products/ZenModel/ZenPackLoader.py zenoss/Products/ZenModel/ZenPackLoader.py
---- zenoss~/Products/ZenModel/ZenPackLoader.py	2007-07-16 04:21:30.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenPackLoader.py	2007-07-22 10:38:06.000000000 +0200
+--- zenoss~/Products/ZenModel/ZenPackLoader.py	2007-07-31 20:31:25.000000000 +0200
++++ zenoss/Products/ZenModel/ZenPackLoader.py	2007-08-08 19:24:30.000000000 +0200
 @@ -17,7 +17,7 @@
  from Products.ZenReports.ReportLoader import ReportLoader
  from Products.ZenUtils.Utils import getObjByPath
@@ -149,7 +149,7 @@
  log = logging.getLogger('zen.ZPLoader')
 diff -urNad zenoss~/Products/ZenModel/ZenossInfo.py zenoss/Products/ZenModel/ZenossInfo.py
 --- zenoss~/Products/ZenModel/ZenossInfo.py	2007-05-18 22:25:16.000000000 +0200
-+++ zenoss/Products/ZenModel/ZenossInfo.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/ZenossInfo.py	2007-08-08 19:24:30.000000000 +0200
 @@ -11,7 +11,7 @@
  #
  ###########################################################################
@@ -161,7 +161,7 @@
  import logging
 diff -urNad zenoss~/Products/ZenModel/migrate/Migrate.py zenoss/Products/ZenModel/migrate/Migrate.py
 --- zenoss~/Products/ZenModel/migrate/Migrate.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/Migrate.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/Migrate.py	2007-08-08 19:24:30.000000000 +0200
 @@ -41,7 +41,7 @@
  
  def cleanup():
@@ -173,7 +173,7 @@
              if f.endswith('.pyc'):
 diff -urNad zenoss~/Products/ZenModel/migrate/about_zenoss.py zenoss/Products/ZenModel/migrate/about_zenoss.py
 --- zenoss~/Products/ZenModel/migrate/about_zenoss.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/about_zenoss.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/about_zenoss.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  
  __version__ = "$Revision$"[11:-2]
@@ -185,7 +185,7 @@
  
 diff -urNad zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py
 --- zenoss~/Products/ZenModel/migrate/betterstandarderrormessage.py	2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/betterstandarderrormessage.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  __version__ = "$Revision$"[11:-2]
  
@@ -197,7 +197,7 @@
      version = Migrate.Version(1, 1, 0)
 diff -urNad zenoss~/Products/ZenModel/migrate/command.py zenoss/Products/ZenModel/migrate/command.py
 --- zenoss~/Products/ZenModel/migrate/command.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/command.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/command.py	2007-08-08 19:24:30.000000000 +0200
 @@ -29,7 +29,7 @@
              dmd.Devices._setProperty(name, default, **kw)
          
@@ -209,7 +209,7 @@
          if dmd.Devices.hasProperty("zNagiosCycleTime"):
 diff -urNad zenoss~/Products/ZenModel/migrate/datapoints.py zenoss/Products/ZenModel/migrate/datapoints.py
 --- zenoss~/Products/ZenModel/migrate/datapoints.py	2007-07-10 17:58:45.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/datapoints.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/datapoints.py	2007-08-08 19:24:30.000000000 +0200
 @@ -19,7 +19,7 @@
  
  __version__ = "$Revision$"[11:-2]
@@ -221,7 +221,7 @@
  
 diff -urNad zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py
 --- zenoss~/Products/ZenModel/migrate/evenbetterstandarderrormessage.py	2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/evenbetterstandarderrormessage.py	2007-08-08 19:24:30.000000000 +0200
 @@ -11,7 +11,7 @@
  '''
  
@@ -233,7 +233,7 @@
      version = Migrate.Version(2, 0, 0)
 diff -urNad zenoss~/Products/ZenModel/migrate/hoist_perf_data.py zenoss/Products/ZenModel/migrate/hoist_perf_data.py
 --- zenoss~/Products/ZenModel/migrate/hoist_perf_data.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/hoist_perf_data.py	2007-08-08 19:24:30.000000000 +0200
 @@ -23,7 +23,7 @@
  
  import Migrate
@@ -245,7 +245,7 @@
      version = Migrate.Version(0, 21, 0)
 diff -urNad zenoss~/Products/ZenModel/migrate/import_export_filesystem.py zenoss/Products/ZenModel/migrate/import_export_filesystem.py
 --- zenoss~/Products/ZenModel/migrate/import_export_filesystem.py	2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/import_export_filesystem.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  
  __version__ = "$Revision$"[11:-2]
@@ -257,7 +257,7 @@
  
 diff -urNad zenoss~/Products/ZenModel/migrate/kill_cricket.py zenoss/Products/ZenModel/migrate/kill_cricket.py
 --- zenoss~/Products/ZenModel/migrate/kill_cricket.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/kill_cricket.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/kill_cricket.py	2007-08-08 19:24:30.000000000 +0200
 @@ -21,7 +21,7 @@
  
  __version__ = "$Revision$"[11:-2]
@@ -269,7 +269,7 @@
  
 diff -urNad zenoss~/Products/ZenModel/migrate/menus.py zenoss/Products/ZenModel/migrate/menus.py
 --- zenoss~/Products/ZenModel/migrate/menus.py	2007-07-17 15:44:14.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/menus.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/menus.py	2007-08-08 19:24:30.000000000 +0200
 @@ -19,7 +19,7 @@
  $Id:$
  '''
@@ -281,7 +281,7 @@
  from Products.ZenModel.Device import Device
 diff -urNad zenoss~/Products/ZenModel/migrate/processes.py zenoss/Products/ZenModel/migrate/processes.py
 --- zenoss~/Products/ZenModel/migrate/processes.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/processes.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/processes.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  __version__ = "$Revision$"[11:-2]
  
@@ -293,7 +293,7 @@
      version = Migrate.Version(0, 22, 0)
 diff -urNad zenoss~/Products/ZenModel/migrate/procparams.py zenoss/Products/ZenModel/migrate/procparams.py
 --- zenoss~/Products/ZenModel/migrate/procparams.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/procparams.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/procparams.py	2007-08-08 19:24:30.000000000 +0200
 @@ -21,8 +21,8 @@
      version = Migrate.Version(1, 1, 0)
  
@@ -307,7 +307,7 @@
          os.system('cat %s | mysql -u%s -p%s %s' % (
 diff -urNad zenoss~/Products/ZenModel/migrate/rrdmin.py zenoss/Products/ZenModel/migrate/rrdmin.py
 --- zenoss~/Products/ZenModel/migrate/rrdmin.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/rrdmin.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/rrdmin.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  
  __version__ = "$Revision$"[11:-2]
@@ -319,7 +319,7 @@
  try:
 diff -urNad zenoss~/Products/ZenModel/migrate/smtpsnpp.py zenoss/Products/ZenModel/migrate/smtpsnpp.py
 --- zenoss~/Products/ZenModel/migrate/smtpsnpp.py	2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/smtpsnpp.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/smtpsnpp.py	2007-08-08 19:24:30.000000000 +0200
 @@ -17,7 +17,7 @@
  
  '''
@@ -331,7 +331,7 @@
      """parse a config file which has key value pairs delimited by white space"""
 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-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standalone_datapoint_rename.py	2007-08-08 19:24:30.000000000 +0200
 @@ -11,7 +11,7 @@
  #
  ###########################################################################
@@ -343,7 +343,7 @@
          fullpath = os.path.join(d, f)
 diff -urNad zenoss~/Products/ZenModel/migrate/standarderrormessage.py zenoss/Products/ZenModel/migrate/standarderrormessage.py
 --- zenoss~/Products/ZenModel/migrate/standarderrormessage.py	2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/standarderrormessage.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/standarderrormessage.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  __version__ = "$Revision$"[11:-2]
  
@@ -355,7 +355,7 @@
      version = Migrate.Version(0, 23, 0)
 diff -urNad zenoss~/Products/ZenModel/migrate/twopointohobjects.py zenoss/Products/ZenModel/migrate/twopointohobjects.py
 --- zenoss~/Products/ZenModel/migrate/twopointohobjects.py	2007-07-12 23:51:44.000000000 +0200
-+++ zenoss/Products/ZenModel/migrate/twopointohobjects.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/migrate/twopointohobjects.py	2007-08-08 19:24:30.000000000 +0200
 @@ -25,7 +25,7 @@
          dmd.Devices.manage_addRRDTemplate('softwareLoopback')
  
@@ -367,7 +367,7 @@
      def _cleanupClass(self, dmd):
 diff -urNad zenoss~/Products/ZenModel/zenbuild.py zenoss/Products/ZenModel/zenbuild.py
 --- zenoss~/Products/ZenModel/zenbuild.py	2007-05-21 16:06:32.000000000 +0200
-+++ zenoss/Products/ZenModel/zenbuild.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/zenbuild.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  __version__ = "$Revision: 1.11 $"[11:-2]
  
@@ -379,7 +379,7 @@
  import transaction
 diff -urNad zenoss~/Products/ZenModel/zendmd.py zenoss/Products/ZenModel/zendmd.py
 --- zenoss~/Products/ZenModel/zendmd.py	2007-06-26 18:11:51.000000000 +0200
-+++ zenoss/Products/ZenModel/zendmd.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/zendmd.py	2007-08-08 19:24:30.000000000 +0200
 @@ -11,7 +11,7 @@
  #
  ###########################################################################
@@ -391,7 +391,7 @@
  try:
 diff -urNad zenoss~/Products/ZenModel/zenmib.py zenoss/Products/ZenModel/zenmib.py
 --- zenoss~/Products/ZenModel/zenmib.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenModel/zenmib.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenModel/zenmib.py	2007-08-08 19:24:30.000000000 +0200
 @@ -11,7 +11,7 @@
  #
  ###########################################################################
@@ -402,8 +402,8 @@
  from sets import Set
  import pprint
 diff -urNad zenoss~/Products/ZenRRD/RenderServer.py zenoss/Products/ZenRRD/RenderServer.py
---- zenoss~/Products/ZenRRD/RenderServer.py	2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenRRD/RenderServer.py	2007-07-22 10:38:06.000000000 +0200
+--- zenoss~/Products/ZenRRD/RenderServer.py	2007-08-01 22:04:12.000000000 +0200
++++ zenoss/Products/ZenRRD/RenderServer.py	2007-08-08 19:24:30.000000000 +0200
 @@ -19,7 +19,7 @@
  
  __version__ = "$Revision: 1.14 $"[11:-2]
@@ -415,7 +415,7 @@
  import urllib
 diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateCpu.py zenoss/Products/ZenRRD/plugins/aggregateCpu.py
 --- zenoss~/Products/ZenRRD/plugins/aggregateCpu.py	2007-06-05 15:19:35.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateCpu.py	2007-08-08 19:24:30.000000000 +0200
 @@ -11,7 +11,7 @@
  #
  ###########################################################################
@@ -427,7 +427,7 @@
  import random
 diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py
 --- zenoss~/Products/ZenRRD/plugins/aggregateFreeMemory.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateFreeMemory.py	2007-08-08 19:24:30.000000000 +0200
 @@ -10,7 +10,7 @@
  # For complete information please visit: http://www.zenoss.com/oss/
  #
@@ -439,7 +439,7 @@
  import rrdtool
 diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateIdle.py zenoss/Products/ZenRRD/plugins/aggregateIdle.py
 --- zenoss~/Products/ZenRRD/plugins/aggregateIdle.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateIdle.py	2007-08-08 19:24:30.000000000 +0200
 @@ -11,7 +11,7 @@
  #
  ###########################################################################
@@ -451,7 +451,7 @@
  import rrdtool
 diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py zenoss/Products/ZenRRD/plugins/aggregateNetwork.py
 --- zenoss~/Products/ZenRRD/plugins/aggregateNetwork.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateNetwork.py	2007-08-08 19:24:30.000000000 +0200
 @@ -10,7 +10,7 @@
  # For complete information please visit: http://www.zenoss.com/oss/
  #
@@ -463,7 +463,7 @@
  import rrdtool
 diff -urNad zenoss~/Products/ZenRRD/plugins/aggregateSwap.py zenoss/Products/ZenRRD/plugins/aggregateSwap.py
 --- zenoss~/Products/ZenRRD/plugins/aggregateSwap.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/aggregateSwap.py	2007-08-08 19:24:30.000000000 +0200
 @@ -10,7 +10,7 @@
  # For complete information please visit: http://www.zenoss.com/oss/
  #
@@ -475,7 +475,7 @@
  import rrdtool
 diff -urNad zenoss~/Products/ZenRRD/plugins/areaLine.py zenoss/Products/ZenRRD/plugins/areaLine.py
 --- zenoss~/Products/ZenRRD/plugins/areaLine.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/areaLine.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/areaLine.py	2007-08-08 19:24:30.000000000 +0200
 @@ -10,7 +10,7 @@
  # For complete information please visit: http://www.zenoss.com/oss/
  #
@@ -487,7 +487,7 @@
  import rrdtool
 diff -urNad zenoss~/Products/ZenRRD/plugins/plugin.py zenoss/Products/ZenRRD/plugins/plugin.py
 --- zenoss~/Products/ZenRRD/plugins/plugin.py	2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/plugin.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/plugin.py	2007-08-08 19:24:30.000000000 +0200
 @@ -10,7 +10,7 @@
  # For complete information please visit: http://www.zenoss.com/oss/
  #
@@ -499,7 +499,7 @@
  TMPDIR='/tmp/renderserver'
 diff -urNad zenoss~/Products/ZenRRD/plugins/randomExample.py zenoss/Products/ZenRRD/plugins/randomExample.py
 --- zenoss~/Products/ZenRRD/plugins/randomExample.py	2007-04-25 21:01:19.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/randomExample.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/randomExample.py	2007-08-08 19:24:30.000000000 +0200
 @@ -13,7 +13,7 @@
  
  # It probably isn't a great example to follow style-wise.
@@ -511,7 +511,7 @@
  import rrdtool
 diff -urNad zenoss~/Products/ZenRRD/plugins/upperLower.py zenoss/Products/ZenRRD/plugins/upperLower.py
 --- zenoss~/Products/ZenRRD/plugins/upperLower.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenRRD/plugins/upperLower.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/plugins/upperLower.py	2007-08-08 19:24:30.000000000 +0200
 @@ -10,7 +10,7 @@
  # For complete information please visit: http://www.zenoss.com/oss/
  #
@@ -523,7 +523,7 @@
  import rrdtool
 diff -urNad zenoss~/Products/ZenRRD/zentestcommand.py zenoss/Products/ZenRRD/zentestcommand.py
 --- zenoss~/Products/ZenRRD/zentestcommand.py	2007-07-16 23:03:45.000000000 +0200
-+++ zenoss/Products/ZenRRD/zentestcommand.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenRRD/zentestcommand.py	2007-08-08 19:24:30.000000000 +0200
 @@ -19,7 +19,7 @@
  
  __version__ = "$Revision$"[11:-2]
@@ -535,7 +535,7 @@
  import time
 diff -urNad zenoss~/Products/ZenReports/ReportServer.py zenoss/Products/ZenReports/ReportServer.py
 --- zenoss~/Products/ZenReports/ReportServer.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenReports/ReportServer.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenReports/ReportServer.py	2007-08-08 19:24:30.000000000 +0200
 @@ -25,7 +25,7 @@
  from Products.ZenModel.ZenModelRM import ZenModelRM
  from Products.ZenUtils.Utils import importClass
@@ -547,7 +547,7 @@
  class ReportServer(ZenModelRM):
 diff -urNad zenoss~/Products/ZenUtils/ConfDaemon.py zenoss/Products/ZenUtils/ConfDaemon.py
 --- zenoss~/Products/ZenUtils/ConfDaemon.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenUtils/ConfDaemon.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenUtils/ConfDaemon.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  __version__ = "$Revision: 1.9 $"[11:-2]
  
@@ -559,7 +559,7 @@
  import time
 diff -urNad zenoss~/Products/ZenUtils/Graphics.py zenoss/Products/ZenUtils/Graphics.py
 --- zenoss~/Products/ZenUtils/Graphics.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenUtils/Graphics.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenUtils/Graphics.py	2007-08-08 19:24:30.000000000 +0200
 @@ -58,7 +58,7 @@
  
  
@@ -571,7 +571,7 @@
              os.system("$ZENHOME/bin/dot -c")
 diff -urNad zenoss~/Products/ZenUtils/ZCmdBase.py zenoss/Products/ZenUtils/ZCmdBase.py
 --- zenoss~/Products/ZenUtils/ZCmdBase.py	2007-06-15 16:54:49.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZCmdBase.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenUtils/ZCmdBase.py	2007-08-08 19:24:30.000000000 +0200
 @@ -26,7 +26,7 @@
  from Exceptions import ZentinelException
  from ZenDaemon import ZenDaemon
@@ -583,7 +583,7 @@
      defaultCacheDir = os.path.join(defaultCacheDir, 'var')
 diff -urNad zenoss~/Products/ZenUtils/ZenBackup.py zenoss/Products/ZenUtils/ZenBackup.py
 --- zenoss~/Products/ZenUtils/ZenBackup.py	2007-07-05 22:09:00.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackup.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackup.py	2007-08-08 19:24:30.000000000 +0200
 @@ -21,8 +21,8 @@
  import Globals
  from ZCmdBase import ZCmdBase
@@ -597,7 +597,7 @@
  import ConfigParser
 diff -urNad zenoss~/Products/ZenUtils/ZenBackupBase.py zenoss/Products/ZenUtils/ZenBackupBase.py
 --- zenoss~/Products/ZenUtils/ZenBackupBase.py	2007-06-04 21:32:10.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenBackupBase.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenBackupBase.py	2007-08-08 19:24:30.000000000 +0200
 @@ -18,8 +18,8 @@
  Common code for zenbackup.py and zenrestore.py
  '''
@@ -611,7 +611,7 @@
  
 diff -urNad zenoss~/Products/ZenUtils/ZenDaemon.py zenoss/Products/ZenUtils/ZenDaemon.py
 --- zenoss~/Products/ZenUtils/ZenDaemon.py	2007-07-10 21:53:24.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenDaemon.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenDaemon.py	2007-08-08 19:24:30.000000000 +0200
 @@ -20,7 +20,7 @@
  __version__ = "$Revision: 1.9 $"[11:-2]
  
@@ -623,7 +623,7 @@
  import logging
 diff -urNad zenoss~/Products/ZenUtils/ZenScriptBase.py zenoss/Products/ZenUtils/ZenScriptBase.py
 --- zenoss~/Products/ZenUtils/ZenScriptBase.py	2007-04-20 15:25:38.000000000 +0200
-+++ zenoss/Products/ZenUtils/ZenScriptBase.py	2007-07-22 10:38:06.000000000 +0200
++++ zenoss/Products/ZenUtils/ZenScriptBase.py	2007-08-08 19:24:30.000000000 +0200
 @@ -22,7 +22,7 @@
  
  from Exceptions import ZentinelException
@@ -634,16 +634,14 @@
  if defaultCacheDir is not None:
      defaultCacheDir = os.path.join(defaultCacheDir, 'var')
 diff -urNad zenoss~/Products/ZenUtils/zenpack.py zenoss/Products/ZenUtils/zenpack.py
---- zenoss~/Products/ZenUtils/zenpack.py	2007-07-18 17:44:53.000000000 +0200
-+++ zenoss/Products/ZenUtils/zenpack.py	2007-07-22 10:38:06.000000000 +0200
-@@ -18,8 +18,8 @@
- from Products.ZenUtils.Utils import cleanupSkins
- import transaction
- 
+--- zenoss~/Products/ZenUtils/zenpack.py	2007-07-31 20:31:25.000000000 +0200
++++ zenoss/Products/ZenUtils/zenpack.py	2007-08-08 19:25:04.000000000 +0200
+@@ -21,7 +21,7 @@
+ from StringIO import StringIO
+ import ConfigParser
+ from Products.ZenModel.ZenPackLoader import CONFIG_FILE, CONFIG_SECTION_ABOUT
 -import os, sys
--import os.path
 +import pwd, os, sys
-+import pwd, os.path
+ import os.path
  
  class ZenPackCmd(ZenScriptBase):
-     "Manage ZenPacks"

Added: trunk/packages/zenoss/debian/patches/zope2.10-zenmodel-report.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/zope2.10-zenmodel-report.dpatch?rev=270&op=file
==============================================================================
--- trunk/packages/zenoss/debian/patches/zope2.10-zenmodel-report.dpatch (added)
+++ trunk/packages/zenoss/debian/patches/zope2.10-zenmodel-report.dpatch Wed Aug  8 18:41:48 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## zope2.10-zenmodel-report.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/ZenModel/Report.py zenoss/Products/ZenModel/Report.py
+--- zenoss~/Products/ZenModel/Report.py	2007-04-20 15:25:38.000000000 +0200
++++ zenoss/Products/ZenModel/Report.py	2007-08-08 15:02:47.000000000 +0200
+@@ -81,7 +81,7 @@
+                                    __name__='pt_editForm')
+                                   
+ 
+-    def __init__(self, id, title = None, text=None, content_type=None):
++    def __init__(self, id, title = None, text=None, content_type='text/html'):
+         ZenModelRM.__init__(self, id);
+         ZopePageTemplate.__init__(self, id, text, content_type)
+         self.title = title

Propchange: trunk/packages/zenoss/debian/patches/zope2.10-zenmodel-report.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: trunk/packages/zenoss/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules (original)
+++ trunk/packages/zenoss/debian/rules Wed Aug  8 18:41:48 2007
@@ -11,9 +11,9 @@
         CFLAGS += -O2
 endif
 
-# we're using python2.4 and zope2.9
+# we're need to use python2.4 as zope doesn't support 2.5 yet
 PYTHON = python2.4
-ZOPE = zope2.9
+ZOPE = zope2.10
 
 #make targets which are not needed to build the package
 include debian/rules-extras.mk
@@ -114,7 +114,8 @@
                $(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
+	sed -i '1 s,#!/usr/bin/python.*,,g' $(CURDIR)/debian/zenoss/usr/share/zope/Products/ZenUITests/tests/selenium/*.py
+	chmod 644 $(CURDIR)/debian/zenoss/usr/share/zope/Products/ZenUITests/tests/selenium/*.py
 	chmod 755 $(CURDIR)/debian/zenoss/usr/share/zope/Products/ZenUtils/ZenBackupBase.py
 
 binary-arch: build-arch install-arch

Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Wed Aug  8 18:41:48 2007
@@ -40,7 +40,7 @@
 	echo "Package: zenoss"          > $@
 	echo "Name: $$product"         >> $@
 	echo "Depends: ####FIXME####"  >> $@
-	echo "ZopeVersions: 2.9"       >> $@
+	echo "ZopeVersions: 2.10"       >> $@
 
 update-dzhandles: $(ZENPRODUCTFILES)
 
@@ -143,7 +143,6 @@
 	    rm -rf pynetsnmp ;\
 	    rm -rf scripts ;\
 	    rmdir test || echo "----> please fix: directory test not empty anymore!" ;\
-	    rm -rf inst/externallibs ;\
 	    rm -rf zendocs/Admin_Guide_1.0_Screens ;\
 	    rm -rf zendocs/Admin\ Guide\ 2.0/screens ;\
 	    rm -rf zendocs/Admin\ Guide\ 2.0/diagrams ;\

Modified: trunk/packages/zenoss/debian/zenoss-doc.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss-doc.install?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss-doc.install (original)
+++ trunk/packages/zenoss/debian/zenoss-doc.install Wed Aug  8 18:41:48 2007
@@ -3,5 +3,4 @@
 inst/docs/Syslog-HOWTO.txt		usr/share/doc/zenoss/
 inst/docs/ZenPackNotes.txt		usr/share/doc/zenoss
 inst/docs/ZenPack.txt			usr/share/doc/zenoss
-inst/docs/HelloWorldZenPack		usr/share/doc/zenoss
 zendocs/Admin_Guide_2.0/ZenossAdminGuide2-0.pdf	usr/share/doc/zenoss

Modified: trunk/packages/zenoss/debian/zenoss-revisions
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss-revisions?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss-revisions (original)
+++ trunk/packages/zenoss/debian/zenoss-revisions Wed Aug  8 18:41:48 2007
@@ -6,3 +6,4 @@
 #vers.	revision
 2.0.2	5878
 2.0.3   5989
+2.0.4	6064

Modified: trunk/packages/zenoss/debian/zenoss.dzinstance
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzinstance?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzinstance (original)
+++ trunk/packages/zenoss/debian/zenoss.dzinstance Wed Aug  8 18:41:48 2007
@@ -1,5 +1,5 @@
 Package: zenoss
-ZopeVersion: 2.9
+ZopeVersion: 2.10
 Name: zenoss
 Addon-Mode: manual
 Addon-Technique: tree-linked

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.DataCollector
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.DataCollector?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.DataCollector (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.DataCollector Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: DataCollector
 Depends: ZenEvents, ZenModel, ZenStatus, ZenUtils, CMFCore
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenEvents
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenEvents?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenEvents (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenEvents Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenEvents
 Depends: ZenModel, ZenRelations, ZenUtils, CMFCore
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenHub
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenHub?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenHub (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenHub Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenHub
 Depends: DataCollector, ZenEvents, ZenModel, ZenRRD, ZenUtils
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenModel
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenModel?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenModel (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenModel Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenModel
 Depends: DataCollector, ZenEvents, ZenHub, ZenRelations, ZenReports, ZenRRD, ZenTestCase, ZenUtils, ZenWidgets, ZenWin, ManagableIndex, AdvancedQuery, CMFCore, PluggableAuthService, PluginRegistry
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRRD
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRRD?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRRD (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRRD Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenRRD
 Depends: DataCollector, ZenEvents, ZenModel, ZenUtils
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRelations
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRelations?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRelations (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRelations Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenRelations
 Depends: ZenTestCase, ZenUtils
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenReports
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenReports?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenReports (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenReports Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenReports
 Depends: ZenModel, ZenUtils
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenStatus
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenStatus?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenStatus (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenStatus Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenStatus
 Depends: DataCollector, ZenEvents, ZenRRD, ZenUtils
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestCase
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestCase?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestCase (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestCase Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenTestCase
 Depends: ZenEvents, ZenModel, ZenRelations
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestRunner
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestRunner?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestRunner (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestRunner Wed Aug  8 18:41:48 2007
@@ -1,3 +1,3 @@
 Package: zenoss
 Name: ZenTestRunner
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUITests
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUITests?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUITests (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUITests Wed Aug  8 18:41:48 2007
@@ -1,3 +1,3 @@
 Package: zenoss
 Name: ZenUITests
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUtils
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUtils?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUtils (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUtils Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenUtils
 Depends: ManagableIndex, ZenModel, CMFCore, PluggableAuthService
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWidgets
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWidgets?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWidgets (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWidgets Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenWidgets
 Depends: CMFCore
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWin
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWin?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWin (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWin Wed Aug  8 18:41:48 2007
@@ -1,4 +1,4 @@
 Package: zenoss
 Name: ZenWin
 Depends: ZenEvents, ZenHub, ZenUtils
-ZopeVersions: 2.9
+ZopeVersions: 2.10

Modified: trunk/packages/zenoss/debian/zenoss.postinst
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.postinst?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.postinst (original)
+++ trunk/packages/zenoss/debian/zenoss.postinst Wed Aug  8 18:41:48 2007
@@ -3,7 +3,7 @@
 
 ZENUSER=zenoss
 ZENGROUP=zenoss
-ZOPE_VERSION=2.9
+ZOPE_VERSION=2.10
 
 . /usr/share/debconf/confmodule
 . /usr/share/dbconfig-common/dpkg/postinst.mysql

Modified: trunk/packages/zenoss/debian/zenoss.prerm
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.prerm?rev=270&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.prerm (original)
+++ trunk/packages/zenoss/debian/zenoss.prerm Wed Aug  8 18:41:48 2007
@@ -16,4 +16,6 @@
 
 #DEBHELPER#
 
+#clean up cache directory
+rm -rf /var/cache/zenoss/renderserver

More information about the Pkg-zenoss-commits mailing list