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

bzed-guest at users.alioth.debian.org bzed-guest at users.alioth.debian.org
Mon Aug 13 18:46:54 UTC 2007


Author: bzed-guest
Date: Mon Aug 13 18:46:54 2007
New Revision: 282

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=282
Log:
moving to zope2.10 again

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/rules
    trunk/packages/zenoss/debian/rules-extras.mk
    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.init
    trunk/packages/zenoss/debian/zenoss.postinst

Modified: trunk/packages/zenoss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/changelog?rev=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/changelog (original)
+++ trunk/packages/zenoss/debian/changelog Mon Aug 13 18:46:54 2007
@@ -2,4 +2,4 @@
 
   * Initial release (closes: #361253)
 
- -- Stefano Zacchiroli <zack at debian.org>  Mon, 13 Aug 2007 17:01:23 +0200
+ -- Bernd Zeimetz <bernd at bzed.de>  Mon, 13 Aug 2007 19:30:43 +0200

Modified: trunk/packages/zenoss/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/control?rev=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/control (original)
+++ trunk/packages/zenoss/debian/control Mon Aug 13 18:46:54 2007
@@ -4,7 +4,7 @@
 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-2), 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
@@ -19,9 +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.9 (>= 2.9.7-3), zope-common (>= 0.5.37),
+ zope2.10 (>= 2.10.4-2), 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/00list (original)
+++ trunk/packages/zenoss/debian/patches/00list Mon Aug 13 18:46:54 2007
@@ -15,4 +15,5 @@
 bin-zenoss-fix
 ZenossInfo-rrd-version
 renderserver-cache-dir
+zope2.10-zenmodel-report
 zendmd_history_location

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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch Mon Aug 13 18:46:54 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

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=282&op=file
==============================================================================
--- trunk/packages/zenoss/debian/patches/zope2.10-zenmodel-report.dpatch (added)
+++ trunk/packages/zenoss/debian/patches/zope2.10-zenmodel-report.dpatch Mon Aug 13 18:46:54 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## zope2.10-zenmodel-report.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: in zope2.10 the default value for content_type changed from None to test/html,
+## DP: we have to follow this change to make zenoss working with zope 2.10
+
+ 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules (original)
+++ trunk/packages/zenoss/debian/rules Mon Aug 13 18:46:54 2007
@@ -13,7 +13,7 @@
 
 # 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

Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Mon Aug 13 18:46:54 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)
 

Modified: trunk/packages/zenoss/debian/zenoss.dzinstance
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzinstance?rev=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzinstance (original)
+++ trunk/packages/zenoss/debian/zenoss.dzinstance Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.DataCollector (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.DataCollector Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenEvents (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenEvents Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenHub (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenHub Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenModel (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenModel Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRRD (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRRD Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRelations (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenRelations Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenReports (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenReports Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenStatus (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenStatus Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestCase (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestCase Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestRunner (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenTestRunner Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUITests (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUITests Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUtils (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenUtils Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWidgets (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWidgets Mon Aug 13 18:46:54 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=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWin (original)
+++ trunk/packages/zenoss/debian/zenoss.dzproduct.ZenWin Mon Aug 13 18:46:54 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.init
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.init?rev=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.init (original)
+++ trunk/packages/zenoss/debian/zenoss.init Mon Aug 13 18:46:54 2007
@@ -1,8 +1,8 @@
 #! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          zenoss
-# Required-Start:    zope2.9
-# Required-Stop:     zope2.9
+# Required-Start:    zope2.10
+# Required-Stop:     zope2.10
 # X-Start-Before:
 # X-Stop-After:      
 # Default-Start:     2

Modified: trunk/packages/zenoss/debian/zenoss.postinst
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.postinst?rev=282&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.postinst (original)
+++ trunk/packages/zenoss/debian/zenoss.postinst Mon Aug 13 18:46:54 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




More information about the Pkg-zenoss-commits mailing list