[Pkg-zenoss-commits] r217 - in /packages/zenoss/trunk/debian: changelog rules rules-extras.mk zenoss.dzinstance zenoss.dzproduct.SiteScopeParser zenoss.dzproduct.SnmpCollector zenoss.dzproduct.ZenModel
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Sun Jul 8 20:25:35 UTC 2007
Author: bzed-guest
Date: Sun Jul 8 20:25:35 2007
New Revision: 217
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=217
Log:
warning: not sure if everything will work, just want to commit before I fuck it up accidentally
Added:
packages/zenoss/trunk/debian/rules-extras.mk
Removed:
packages/zenoss/trunk/debian/zenoss.dzproduct.SiteScopeParser
packages/zenoss/trunk/debian/zenoss.dzproduct.SnmpCollector
Modified:
packages/zenoss/trunk/debian/changelog
packages/zenoss/trunk/debian/rules
packages/zenoss/trunk/debian/zenoss.dzinstance
packages/zenoss/trunk/debian/zenoss.dzproduct.ZenModel
Modified: packages/zenoss/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/changelog?rev=217&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/changelog (original)
+++ packages/zenoss/trunk/debian/changelog Sun Jul 8 20:25:35 2007
@@ -1,4 +1,4 @@
-zenoss (2.0+r5840-1) UNRELEASED; urgency=low
+zenoss (2.0.2-1) UNRELEASED; urgency=low
[ Stefano Zacchiroli ]
* debian/zenoss.postinst
@@ -14,7 +14,9 @@
patch description for more details.
[ Bernd Zeimetz ]
- * updating to latest svn revision
+ * updating to latest upstream release
+ * removing SnmpCollector and SiteScopeParser products from the packaging as
+ they don't exist anymore in the latest release
* debian/rules:
- run dh_installdebconf before dh_installdeb
- add missing perf directory to our Zope skeleton
Modified: packages/zenoss/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules?rev=217&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules (original)
+++ packages/zenoss/trunk/debian/rules Sun Jul 8 20:25:35 2007
@@ -15,10 +15,8 @@
PYTHON = python2.4
ZOPE = zope2.9
-# Define the Zenoss' version we're packaging
-VERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,~.*,,g;s,+r.*,,g')
-EXTRAVERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,^$(VERSION),,g;;s,+r.*,,g')
-REVISION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.*+r,,g;s,-.*,,g')
+#make targets which are not needed to build the package
+include debian/rules-extras.mk
# SQL snippets that will be concatenated to obtain the .sql file that will be
# executed (as the db admin) by dbconfig-common to create zenoss MySQL database
@@ -27,11 +25,6 @@
Products/ZenEvents/db/zenevents.sql \
Products/ZenEvents/db/zenprocs.sql \
$(NULL)
-
-#there's no 2.0 tag yet, need to change that later.
-#we're packaging trunk for now
-#ZENOSS_SVN = http://dev.zenoss.com/svn/tags/zenoss-$(VERSION)
-ZENOSS_SVN = http://dev.zenoss.com/svn/trunk
build: build-indep build-arch
build-arch: build-arch-stamp
@@ -131,131 +124,9 @@
dh_md5sums -i
dh_builddeb -i
-##############################################################################
-# targets which are not used while building the package
-#
-#
-update-dzhandles:
- set -e ;\
- find Products/ -mindepth 1 -maxdepth 1 -type d | \
- grep -v \.svn | \
- sed 's,Products/,,g' | \
- while read product; do \
- prodfile=debian/zenoss.dzproduct.$$product ;\
- if [ ! -e $$prodfile ]; then \
- echo "Package: zenoss" > $$prodfile ;\
- echo "Name: $$product" >>$$prodfile ;\
- echo "Depends: ####FIXME####" >>$$prodfile ;\
- echo "ZopeVersions: 2.9" >>$$prodfile ;\
- fi ;\
- done
-
-
-# set to 0 if you do not want to keep upstream's svn
-KEEP_UPSTREAM=1
-
-# get-orig-source will drop the orig.tar.gz in
-# ../tarballs, if the directory exists
-get-orig-source:
- set -e ;\
- if dh_testroot 2>/dev/null; then \
- echo "You must NOT run get-orig-source as root!" ;\
- exit 1 ;\
- fi ;\
- \
- \
- echo "finding directories" ;\
- if [ -d ../tarballs ]; then \
- packbase="$(CURDIR)/../tarballs" ;\
- upstream="$(CURDIR)/../upstream" ;\
- else \
- packbase="$(CURDIR)" ;\
- upstream="$(CURDIR)/upstream" ;\
- fi ;\
- mkdir -p $$upstream ;\
- mkdir -p $$packbase ;\
- \
- echo "getting revision from svn" ;\
- if [ -z $(REVISION) ]; then \
- revision=`svn info $(ZENOSS_SVN) | \
- grep Revision | \
- sed 's,[^0-9]*,,g'` ;\
- else revision=$(REVISION) ;\
- fi ;\
- \
- echo "checking destinations for .orig dir and .orig.tar.gz" ;\
- tarball="zenoss_$(VERSION)$(EXTRAVERSION)+r$$revision.orig.tar.gz" ;\
- if [ -e $$packbase/$$tarball ]; then \
- echo "$$tarball exists in $$packbase" ;\
- echo "please remove it before trying to create a new one" ;\
- exit 1 ;\
- fi ;\
- origdirname="zenoss-$(VERSION)$(EXTRAVERSION)+r$$revision.orig" ;\
- packdir="$$packbase/$$origdirname" ;\
- if [ -d $$packdir ]; then \
- echo "$$packdir exists, please remove first" ;\
- exit 1 ;\
- fi ;\
- \
- echo "fetching the Zenoss source from svn" ;\
- if [ $(KEEP_UPSTREAM) -gt 0 ]; then \
- echo " (keeping sources)" ;\
- if [ -d $$upstream/zenoss/.svn ]; then \
- svn up -r$$revision $$upstream/zenoss >/dev/null;\
- else \
- mkdir -p $$upstream ;\
- svn co -r$$revision $(ZENOSS_SVN) $$upstream/zenoss >/dev/null;\
- fi ;\
- svn export $$upstream/zenoss $$packdir ;\
- else \
- echo " (not keeping sources)" ;\
- svn export -r$$revision $(ZENOSS_SVN) $$packdir ;\
- fi ;\
- pushd . >/dev/null ;\
- cd $$packdir ;\
- \
- echo "extracting needed external libs, removing the rest" ;\
- tar xfz inst/externallibs/PDIS-XPath-0.3.tar.gz ;\
- rm -rf inst/externallibs ;\
- \
- echo "removing what we don't want to have in the tarball" ;\
- rm -rf Products/OFolder/ ;\
- rm -rf Products/ManagableIndex/ ;\
- rm -rf Products/AdvancedQuery/ ;\
- rm -rf Products/CMFCore/ ;\
- rm -rf Products/GenericSetup/ ;\
- rm -rf Products/Five/ ;\
- rm -rf Products/PluggableAuthService/ ;\
- rm -rf Products/PluginRegistry/ ;\
- rm -f Products/DataCollector/plugins/setignore.sh ;\
- rm -rf Products/Hotfix_20070320 ;\
- rm -rf wmi ;\
- rm -rf evtsys ;\
- rm -rf zenwin ;\
- rm -rf zenplugins ;\
- rm -rf pynetsnmp ;\
- 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 ;\
- rm -rf zendocs/QuickStartGuide-1.0 zendocs/ZenossQStart-1.0.pdf ;\
- find . -name .svnignore -print0 | xargs -0 rm -f ;\
- find . -name .cvsignore -print0 | xargs -0 rm -f ;\
- rm -f Products/ZenEvents/docs/rfc3164.txt ;\
- \
- echo "packaging the orig.tar.gz and cleaning up" ;\
- cd $$packdir/.. ;\
- tar cf - $$origdirname | gzip --best - > $$tarball ;\
- rm -rf $$origdirname ;\
- popd >/dev/null ;\
- echo "tarball: $$packbase/$$tarball" ;\
- echo "done."
-
-##############################################################################
binary: binary-arch binary-indep
.PHONY: build build-indep build-arch clean clean-indep clean-arch
.PHONY: binary-indep binary-arch binary install
-.PHONY: patch unpatch get-orig-source update-dzhandles
+.PHONY: patch unpatch
Added: packages/zenoss/trunk/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules-extras.mk?rev=217&op=file
==============================================================================
--- packages/zenoss/trunk/debian/rules-extras.mk (added)
+++ packages/zenoss/trunk/debian/rules-extras.mk Sun Jul 8 20:25:35 2007
@@ -1,0 +1,131 @@
+
+# Define the Zenoss' version we're packaging
+VERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,~.*,,g;s,+r.*,,g')
+EXTRAVERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,^$(VERSION),,g;;s,+r.*,,g')
+REVISION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.*+r,,g;s,-.*,,g')
+
+ZENOSS_SVN = http://dev.zenoss.com/svn/trunk
+
+ZENPRODUCTS = $(shell find Products/ -mindepth 1 -maxdepth 1 -type d | \
+ grep -v \.svn | sed 's,Products/,,g')
+
+ZENPRODUCTFILES = $(shell echo $(ZENPRODUCTS) | sed 's,^,debian/zenoss.dzproduct.,,g')
+
+
+debian/zenoss.dzproduct.%:
+ echo "Package: zenoss" > $@
+ echo "Name: $$product" >> $@
+ echo "Depends: ####FIXME####" >> $@
+ echo "ZopeVersions: 2.9" >> $@
+
+update-dzhandles: $(ZENPRODUCTFILES)
+
+check-dzhandles: update-dzhandles
+ if grep FIXME $(ZENPRODUCTFILES); then \
+ echo 'Please fix those files before building!' ;\
+ exit 1 ;\
+ fi
+
+
+# set to 0 if you do not want to keep upstream's svn
+KEEP_UPSTREAM=1
+
+# get-orig-source will drop the orig.tar.gz in
+# ../tarballs, if the directory exists
+get-orig-source:
+ set -e ;\
+ if dh_testroot 2>/dev/null; then \
+ echo "You must NOT run get-orig-source as root!" ;\
+ exit 1 ;\
+ fi ;\
+ \
+ \
+ echo "finding directories" ;\
+ if [ -d ../tarballs ]; then \
+ packbase="$(CURDIR)/../tarballs" ;\
+ upstream="$(CURDIR)/../upstream" ;\
+ else \
+ packbase="$(CURDIR)" ;\
+ upstream="$(CURDIR)/upstream" ;\
+ fi ;\
+ mkdir -p $$upstream ;\
+ mkdir -p $$packbase ;\
+ \
+ echo "getting revision from svn" ;\
+ if [ -z $(REVISION) ]; then \
+ revision=`svn info $(ZENOSS_SVN) | \
+ grep Revision | \
+ sed 's,[^0-9]*,,g'` ;\
+ else revision=$(REVISION) ;\
+ fi ;\
+ \
+ echo "checking destinations for .orig dir and .orig.tar.gz" ;\
+ tarball="zenoss_$(VERSION)$(EXTRAVERSION)+r$$revision.orig.tar.gz" ;\
+ if [ -e $$packbase/$$tarball ]; then \
+ echo "$$tarball exists in $$packbase" ;\
+ echo "please remove it before trying to create a new one" ;\
+ exit 1 ;\
+ fi ;\
+ origdirname="zenoss-$(VERSION)$(EXTRAVERSION)+r$$revision.orig" ;\
+ packdir="$$packbase/$$origdirname" ;\
+ if [ -d $$packdir ]; then \
+ echo "$$packdir exists, please remove first" ;\
+ exit 1 ;\
+ fi ;\
+ \
+ echo "fetching the Zenoss source from svn" ;\
+ if [ $(KEEP_UPSTREAM) -gt 0 ]; then \
+ echo " (keeping sources)" ;\
+ if [ -d $$upstream/zenoss/.svn ]; then \
+ svn up -r$$revision $$upstream/zenoss >/dev/null;\
+ else \
+ mkdir -p $$upstream ;\
+ svn co -r$$revision $(ZENOSS_SVN) $$upstream/zenoss >/dev/null;\
+ fi ;\
+ svn export $$upstream/zenoss $$packdir ;\
+ else \
+ echo " (not keeping sources)" ;\
+ svn export -r$$revision $(ZENOSS_SVN) $$packdir ;\
+ fi ;\
+ pushd . >/dev/null ;\
+ cd $$packdir ;\
+ \
+ echo "extracting needed external libs, removing the rest" ;\
+ tar xfz inst/externallibs/PDIS-XPath-0.3.tar.gz ;\
+ rm -rf inst/externallibs ;\
+ \
+ echo "removing what we don't want to have in the tarball" ;\
+ rm -rf Products/OFolder/ ;\
+ rm -rf Products/ManagableIndex/ ;\
+ rm -rf Products/AdvancedQuery/ ;\
+ rm -rf Products/CMFCore/ ;\
+ rm -rf Products/GenericSetup/ ;\
+ rm -rf Products/Five/ ;\
+ rm -rf Products/PluggableAuthService/ ;\
+ rm -rf Products/PluginRegistry/ ;\
+ rm -f Products/DataCollector/plugins/setignore.sh ;\
+ rm -rf Products/Hotfix_20070320 ;\
+ rm -rf wmi ;\
+ rm -rf evtsys ;\
+ rm -rf zenwin ;\
+ rm -rf zenplugins ;\
+ rm -rf pynetsnmp ;\
+ 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 ;\
+ rm -rf zendocs/QuickStartGuide-1.0 zendocs/ZenossQStart-1.0.pdf ;\
+ find . -name .svnignore -print0 | xargs -0 rm -f ;\
+ find . -name .cvsignore -print0 | xargs -0 rm -f ;\
+ rm -f Products/ZenEvents/docs/rfc3164.txt ;\
+ \
+ echo "packaging the orig.tar.gz and cleaning up" ;\
+ cd $$packdir/.. ;\
+ tar cf - $$origdirname | gzip --best - > $$tarball ;\
+ rm -rf $$origdirname ;\
+ popd >/dev/null ;\
+ echo "tarball: $$packbase/$$tarball" ;\
+ echo "done."
+
+.PHONY: get-orig-source update-dzhandles check-dzhandles
Modified: packages/zenoss/trunk/debian/zenoss.dzinstance
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss.dzinstance?rev=217&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss.dzinstance (original)
+++ packages/zenoss/trunk/debian/zenoss.dzinstance Sun Jul 8 20:25:35 2007
@@ -4,7 +4,7 @@
Addon-Mode: manual
Addon-Technique: tree-linked
Restart-Policy: end
-Products: ZenModel, SnmpCollector, SiteScopeParser, DataCollector, ZenRelations, ZenRRD, ZenEvents, ZenStatus, ZenTestCase, ZenReports, ZenWidgets, ZenTestRunner, ZenUITests, ZenUtils
+Products: ZenModel, DataCollector, ZenRelations, ZenRRD, ZenEvents, ZenStatus, ZenTestCase, ZenReports, ZenWidgets, ZenTestRunner, ZenUITests, ZenUtils
Skeleton: /usr/lib/zenoss/skel
Zope-Database: ZEO
Zope-User: zenoss:zenoss
Modified: packages/zenoss/trunk/debian/zenoss.dzproduct.ZenModel
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss.dzproduct.ZenModel?rev=217&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss.dzproduct.ZenModel (original)
+++ packages/zenoss/trunk/debian/zenoss.dzproduct.ZenModel Sun Jul 8 20:25:35 2007
@@ -1,4 +1,4 @@
Package: zenoss
Name: ZenModel
-Depends: DataCollector, SnmpCollector, ZenEvents, ZenHub, ZenRelations, ZenReports, ZenRRD, ZenTestCase, ZenUtils, ZenWidgets, ZenWin, ManagableIndex, AdvancedQuery, CMFCore, PluggableAuthService, PluginRegistry
+Depends: DataCollector, ZenEvents, ZenHub, ZenRelations, ZenReports, ZenRRD, ZenTestCase, ZenUtils, ZenWidgets, ZenWin, ManagableIndex, AdvancedQuery, CMFCore, PluggableAuthService, PluginRegistry
ZopeVersions: 2.9
More information about the Pkg-zenoss-commits
mailing list