r807 - in zenoss/trunk: Products/DataCollector/plugins
Products/ZenEvents/db Products/ZenModel/skins/zenmodel
Products/ZenModel/tests debian debian/patches testgen/bin
testgen/tests/cgi-bin zenplugins
Bernd Zeimetz
bzed-guest at alioth.debian.org
Fri Apr 13 21:25:43 UTC 2007
Author: bzed-guest
Date: 2007-04-13 21:25:43 +0000 (Fri, 13 Apr 2007)
New Revision: 807
Added:
zenoss/trunk/debian/patches/
zenoss/trunk/debian/patches/00list
zenoss/trunk/debian/patches/pdis-distutils.dpatch
zenoss/trunk/debian/patches/testgen-distutils.dpatch
zenoss/trunk/debian/patches/zenplugins-distutils.dpatch
zenoss/trunk/debian/pyversions.zenoss-plugins
zenoss/trunk/debian/zenoss-doc.doc-base
Removed:
zenoss/trunk/debian/zenoss-doc.doc-base.adminguide
Modified:
zenoss/trunk/Products/DataCollector/plugins/setignore.sh
zenoss/trunk/Products/ZenEvents/db/loadZenEvents.sh
zenoss/trunk/Products/ZenModel/skins/zenmodel/arrows.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_app.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_dark_loginbox.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_dark_loginbox_blue.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_insidebox.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_login_img.jpg
zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_login_img_blue.jpg
zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_loginscreen.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_topPane.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/breadcrumb_left_curve.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/codecs.js
zenoss/trunk/Products/ZenModel/skins/zenmodel/crypto.js
zenoss/trunk/Products/ZenModel/skins/zenmodel/dark_loginbox_bottom.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/dark_loginbox_bottom_blue.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/header_tab_left.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/header_tab_right.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/init.js
zenoss/trunk/Products/ZenModel/skins/zenmodel/jsonrpc.js
zenoss/trunk/Products/ZenModel/skins/zenmodel/lang.js
zenoss/trunk/Products/ZenModel/skins/zenmodel/loginbox_bottom.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/loginbox_middle.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/loginbox_top.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/logo_login.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/logo_old.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/subtitle_bkgrd.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_corner.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_left.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_left_selected.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_right.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_right_selected.gif
zenoss/trunk/Products/ZenModel/skins/zenmodel/urllib.js
zenoss/trunk/Products/ZenModel/skins/zenmodel/xml.js
zenoss/trunk/Products/ZenModel/skins/zenmodel/xmlrpc.js
zenoss/trunk/Products/ZenModel/tests/devicePopulator.py
zenoss/trunk/debian/control
zenoss/trunk/debian/rules
zenoss/trunk/testgen/bin/testgen-convert
zenoss/trunk/testgen/bin/testgen-twill
zenoss/trunk/testgen/tests/cgi-bin/printSubmitted.py
zenoss/trunk/testgen/tests/cgi-bin/printYes.py
zenoss/trunk/zenplugins/rpm.sh
Log:
a lot of changes, removing *ARRGH* dumbfuck executeable settings on files...
Property changes on: zenoss/trunk/Products/DataCollector/plugins/setignore.sh
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenEvents/db/loadZenEvents.sh
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/arrows.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_app.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_dark_loginbox.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_dark_loginbox_blue.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_insidebox.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_login_img.jpg
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_login_img_blue.jpg
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_loginscreen.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/bg_topPane.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/breadcrumb_left_curve.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/codecs.js
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/crypto.js
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/dark_loginbox_bottom.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/dark_loginbox_bottom_blue.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/header_tab_left.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/header_tab_right.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/init.js
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/jsonrpc.js
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/lang.js
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/loginbox_bottom.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/loginbox_middle.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/loginbox_top.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/logo_login.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/logo_old.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/subtitle_bkgrd.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_corner.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_left.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_left_selected.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_right.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/tab_right_selected.gif
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/urllib.js
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/xml.js
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/skins/zenmodel/xmlrpc.js
___________________________________________________________________
Name: svn:executable
-
Property changes on: zenoss/trunk/Products/ZenModel/tests/devicePopulator.py
___________________________________________________________________
Name: svn:executable
-
Modified: zenoss/trunk/debian/control
===================================================================
--- zenoss/trunk/debian/control 2007-04-13 18:40:32 UTC (rev 806)
+++ zenoss/trunk/debian/control 2007-04-13 21:25:43 UTC (rev 807)
@@ -21,9 +21,7 @@
zope-cmfcore1.6, zope-genericsetup, zope-pas, zope-pluginregistry,
libart-2.0-2 (>= 2.3.17), libfreetype6 (>= 2.1.9), libsmi2,
rrdtool (>= 1.2.15)
-Recommends: mysql-server-5.0 (>= 5.0.22), sendpage-client, klogd
-Conflicts: system-log-daemon
-Provides: system-log-daemon
+Recommends: mysql-server-5.0 (>= 5.0.22), sendpage-client, klogd, zenoss-plugins
Description: infrastucture monitoring and managment system
Zenoss is an integrated system to monitor and manage your
IT infrastructure. It has the following features:
@@ -34,13 +32,20 @@
- Manual and automatic discovery of devices
- Organize devices by location/operator, inheritance
- History and change details
- o Avaiability, performance and monitoring
+ o Avaiability, performance and event monitoring
- providing reports, statistics and graphs
- - alerts
- o Rich web portal and dashboards
+ - alerts via email and pager
+ o Rich web portal and dashboard
.
Homepage: http://zenoss.com/
+Package: zenoss-plugins
+Architecture: all
+Depends: ${python:Depends}
+Suggests: nagios-plugins
+Description: FIXME
+ FIXME
+
Package: zenoss-doc
Architecture: all
Description: Documentation for zenoss
Added: zenoss/trunk/debian/patches/00list
===================================================================
--- zenoss/trunk/debian/patches/00list 2007-04-13 18:40:32 UTC (rev 806)
+++ zenoss/trunk/debian/patches/00list 2007-04-13 21:25:43 UTC (rev 807)
@@ -0,0 +1,3 @@
+pdis-distutils.dpatch
+testgen-distutils.dpatch
+zenplugins-distutils.dpatch
Added: zenoss/trunk/debian/patches/pdis-distutils.dpatch
===================================================================
--- zenoss/trunk/debian/patches/pdis-distutils.dpatch 2007-04-13 18:40:32 UTC (rev 806)
+++ zenoss/trunk/debian/patches/pdis-distutils.dpatch 2007-04-13 21:25:43 UTC (rev 807)
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pdis-distutils.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: using distutils instead of ez_setup
+
+ at DPATCH@
+diff -urNad trunk~/PDIS-XPath-0.3/setup.py trunk/PDIS-XPath-0.3/setup.py
+--- trunk~/PDIS-XPath-0.3/setup.py 2007-04-12 23:11:33.000000000 +0200
++++ trunk/PDIS-XPath-0.3/setup.py 2007-04-13 22:28:49.000000000 +0200
+@@ -1,6 +1,4 @@
+-import ez_setup
+-ez_setup.use_setuptools()
+-from setuptools import setup
++from distutils.core import setup
+
+ setup(name="PDIS-XPath",
+ version="0.3",
Added: zenoss/trunk/debian/patches/testgen-distutils.dpatch
===================================================================
--- zenoss/trunk/debian/patches/testgen-distutils.dpatch 2007-04-13 18:40:32 UTC (rev 806)
+++ zenoss/trunk/debian/patches/testgen-distutils.dpatch 2007-04-13 21:25:43 UTC (rev 807)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## testgen-distutils.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: testgen: using distutils instead of ez_setup
+
+ at DPATCH@
+diff -urNad trunk~/testgen/setup.py trunk/testgen/setup.py
+--- trunk~/testgen/setup.py 2006-12-06 09:24:24.000000000 +0100
++++ trunk/testgen/setup.py 2007-04-13 22:24:22.000000000 +0200
+@@ -1,6 +1,4 @@
+-import ez_setup
+-ez_setup.use_setuptools()
+-from setuptools import setup
++from distutils.core import setup
+
+ setup(name="TestGen4Web-Python",
+ version="0.2.2",
+@@ -36,17 +34,6 @@
+ packages=[
+ 'testgen',
+ ],
+- install_requires = [
+- "elementtree",
+- "PDIS-XPath",
+- "mechanize",
+- "ClientCookie",
+- #"ZopeTestbrowser", -- this cannot currently be run as an indpendent
+- # package without throwing errors. To use support for zope.testbrowser,
+- # you should have a recent Zope installed (>= 2.9.4) and have that
+- # Zope's lib/python in your python path.
+- "twill",
+- ],
+ scripts = [
+ 'bin/testgen-convert',
+ 'bin/testgen-twill',
Added: zenoss/trunk/debian/patches/zenplugins-distutils.dpatch
===================================================================
--- zenoss/trunk/debian/patches/zenplugins-distutils.dpatch 2007-04-13 18:40:32 UTC (rev 806)
+++ zenoss/trunk/debian/patches/zenplugins-distutils.dpatch 2007-04-13 21:25:43 UTC (rev 807)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## zenplugins-distutils.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: using distutils instead of setuptools
+
+ at DPATCH@
+diff -urNad trunk~/zenplugins/setup.py trunk/zenplugins/setup.py
+--- trunk~/zenplugins/setup.py 2007-01-05 17:52:34.000000000 +0100
++++ trunk/zenplugins/setup.py 2007-04-13 22:26:54.000000000 +0200
+@@ -22,7 +22,7 @@
+
+ return open(os.path.join(DIR, DESCRIPTION_DOC)).read()
+
+-from setuptools import setup
++from distutils.core import setup
+
+
+ VERSION = "1.1.0"
Copied: zenoss/trunk/debian/pyversions.zenoss-plugins (from rev 795, zenoss/trunk/debian/pyversions)
===================================================================
--- zenoss/trunk/debian/pyversions 2007-04-13 01:05:15 UTC (rev 795)
+++ zenoss/trunk/debian/pyversions.zenoss-plugins 2007-04-13 21:25:43 UTC (rev 807)
@@ -0,0 +1 @@
+2.3-
Modified: zenoss/trunk/debian/rules
===================================================================
--- zenoss/trunk/debian/rules 2007-04-13 18:40:32 UTC (rev 806)
+++ zenoss/trunk/debian/rules 2007-04-13 21:25:43 UTC (rev 807)
@@ -2,58 +2,62 @@
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
# Define the Zenoss' version we're packaging
ZENOSS_VERSION := $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,-.*,,g')
ZENOSS_SVN := http://dev.zenoss.com/svn/tags/zenoss-$(ZENOSS_VERSION)
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
+
+
#Architecture
-build: build-indep
+build: build-stamp
+build-stamp: patch
+ dh_testdir
+ dh_testroot
-build-indep: build-indep-stamp
-build-indep-stamp:
cd PDIS-XPath-0.3; python setup.py build
cd testgen; python setup.py build
touch $@
-clean:
+clean: clean1 unpatch
+clean1:
dh_testdir
dh_testroot
- rm -f build-arch-stamp build-indep-stamp
+ cd PDIS-XPath-0.3; python setup.py clean -a
+ cd testgen; python setup.py clean -a
+ cd zenplugins; python setup.py clean -a
+ find testgen PDIS-XPath-0.3 zenplugins -name \*.pyc -exec rm -f {} \;
+ dh_clean
+ rm -f build-stamp
- # Add here commands to clean up after the build process.
-
- dh_clean
-
-install: install-indep
-install-indep:
+install: build
dh_testdir
dh_testroot
dh_clean -k -i
dh_installdirs -i
- # Add here commands to install the indep part of the package into
- # debian/<package>-doc.
- #INSTALLDOC#
-
- cd PDIS-XPath-0.3; setup.py install --debian --root $(CURDIR)/debian/zenoss
- cd testgen; setup.py install --debian --root $(CURDIR)/debian/zenoss
+ cd PDIS-XPath-0.3; python setup.py install \
+ --root=$(CURDIR)/debian/zenoss \
+ --install-purelib=/usr/share/python-support/zenoss \
+ --no-compile -O0
+ cd testgen; python setup.py install --root $(CURDIR)/debian/zenoss \
+ --install-purelib=/usr/share/python-support/zenoss \
+ --no-compile -O0
+ cd zenplugins; python setup.py install --root $(CURDIR)/debian/zenoss-plugins \
+ --install-purelib=/usr/share/python-support/zenoss-plugins \
+ --no-compile -O0
dh_install -i
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
+binary-indep:
dh_testdir
dh_testroot
dh_installchangelogs
- dh_installdocs
+ dh_installdocs
# dh_installexamples
# dh_installmenu
# dh_installdebconf
@@ -61,12 +65,12 @@
# dh_installemacsen
# dh_installpam
# dh_installmime
- dh_pythonsupport
+ dh_pysupport -pzenoss-plugins
# dh_installinit
# dh_installcron
# dh_installinfo
- dh_installman
- dh_link -pzenoss-doc /usr/share/doc/zenoss-doc/doc /usr/share/doc/zenoss
+ dh_installman
+ dh_link -pzenoss-doc /usr/share/doc/zenoss /usr/share/doc/zenoss-doc/doc
dh_link
# dh_strip
dh_compress
@@ -80,15 +84,6 @@
dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary: binary-indep
-
-
-
##############################################################################
# targets which are not used while building the package
#
@@ -105,6 +100,7 @@
cd $$packdir ;\
svn export $(ZENOSS_SVN)/Products ;\
svn export $(ZENOSS_SVN)/testgen ;\
+ svn export $(ZENOSS_SVN)/zenplugins ;\
svn export $(ZENOSS_SVN)/inst/externallibs/PDIS-XPath-0.3.tar.gz ;\
tar xfz PDIS-XPath-0.3.tar.gz ;\
rm PDIS-XPath-0.3.tar.gz ;\
@@ -120,7 +116,15 @@
pushd . ;\
cd inst/ ;\
svn -N export $(ZENOSS_SVN)/inst/docs ;\
+ svn export $(ZENOSS_SVN)/inst/conf/ ;\
svn export $(ZENOSS_SVN)/inst/fs ;\
+ if ! test -d fs; then \
+ mkdir -p fs/etc ;\
+ svn export $(ZENOSS_SVN)/inst/cron ;\
+ svn export $(ZENOSS_SVN)/inst/logrotate.d ;\
+ mv cron/* logrotate.d fs/etc ;\
+ rm -rf cron ;\
+ fi ;\
svn export $(ZENOSS_SVN)/inst/conf/ ;\
svn export $(ZENOSS_SVN)/bin ;\
rm -f docs/BUILD_* ;\
@@ -131,10 +135,10 @@
rm -f docs/*.doc ;\
rm -f docs/ZenossAdminGuide-1.0.0.pdf ;\
rm -f docs/ZenossQStart-1.0.pdf ;\
- chmod 644 docs/* ;\
popd ;\
find . -name \.cvsignore -exec rm -f {} \; ;\
find . -name \.svnignore -exec rm -f {} \; ;\
+ find zenplugins testgen Products PDIS-XPath-0.3 inst/docs -type f -exec chmod 644 {} \; ;\
cd .. ;\
tar cvf - zenoss-$(ZENOSS_VERSION).orig | gzip --best - \
> $$tarball ;\
@@ -143,4 +147,8 @@
#
##############################################################################
-.PHONY: build clean binary-indep binary install install-indep get-orig-source
+binary-arch: build install
+binary: binary-arch binary-indep
+
+.PHONY: build clean binary-indep binary-arch binary install\
+ clean1 patch unpatch get-orig-source
Copied: zenoss/trunk/debian/zenoss-doc.doc-base (from rev 798, zenoss/trunk/debian/zenoss-doc.doc-base.adminguide)
Deleted: zenoss/trunk/debian/zenoss-doc.doc-base.adminguide
===================================================================
--- zenoss/trunk/debian/zenoss-doc.doc-base.adminguide 2007-04-13 18:40:32 UTC (rev 806)
+++ zenoss/trunk/debian/zenoss-doc.doc-base.adminguide 2007-04-13 21:25:43 UTC (rev 807)
@@ -1,11 +0,0 @@
-Document: zenoss-adminguide
-Title: Zenoss Administrator's Guide
-Author: Zenoss, Inc
-Abstract: The Zenoss Administrator's Guide
- This document will give an overview of the architecture
- of the Zenoss system and describe how to perform common
- managment tasks.
-Section: Apps/System
-
-Format: PDF
-Files: /usr/share/doc/zenoss/ZenossAdminGuide-1.1.pdf
Property changes on: zenoss/trunk/testgen/bin/testgen-convert
___________________________________________________________________
Name: svn:executable
- *
Property changes on: zenoss/trunk/testgen/bin/testgen-twill
___________________________________________________________________
Name: svn:executable
- *
Property changes on: zenoss/trunk/testgen/tests/cgi-bin/printSubmitted.py
___________________________________________________________________
Name: svn:executable
- *
Property changes on: zenoss/trunk/testgen/tests/cgi-bin/printYes.py
___________________________________________________________________
Name: svn:executable
- *
Property changes on: zenoss/trunk/zenplugins/rpm.sh
___________________________________________________________________
Name: svn:executable
- *
More information about the pkg-zope-commits
mailing list