r820 - in zenoss/trunk/debian: . patches
Bernd Zeimetz
bzed-guest at alioth.debian.org
Thu Apr 19 21:42:21 UTC 2007
Author: bzed-guest
Date: 2007-04-19 21:42:21 +0000 (Thu, 19 Apr 2007)
New Revision: 820
Removed:
zenoss/trunk/debian/patches/zenplugins-distutils.dpatch
Modified:
zenoss/trunk/debian/README.Debian-source
zenoss/trunk/debian/control
zenoss/trunk/debian/patches/00list
zenoss/trunk/debian/rules
zenoss/trunk/debian/zenoss-doc.install
Log:
get-orig-source for tarballs, several other changes
Modified: zenoss/trunk/debian/README.Debian-source
===================================================================
--- zenoss/trunk/debian/README.Debian-source 2007-04-19 21:28:37 UTC (rev 819)
+++ zenoss/trunk/debian/README.Debian-source 2007-04-19 21:42:21 UTC (rev 820)
@@ -3,15 +3,17 @@
Zenoss only provides an about 50MB large .tar.gz, which contains
an installer and almost all dependencies for all supported platforms,
-hence Debian's orig.tar.gz was completely repackaged by pulling
-the needed files from Zenoss' svn directly. The repackaged tarball
-is only about 5.5MB.
+hence Debian's orig.tar.gz was completely repackaged.The resulting
+tarball is only about 5.5MB.
To create the orig.tar.gz, please run
- fakeroot debian/rules get-orig-source
+ debian/rules get-orig-source
which will drop the orig.tar.gz in ../tarballs, as needed to use
with the svn-buildpackage tools.
+In case you'd like to retrieve the orig.tar.gz from svn, please run
+ debian/rules get-orig-source-from-svn
+
Please note that the repackaging was not done because of licensing/
copyright issues. Zenoss, it's documentation and all dependencies
are under DFSG compatible licenses.
Modified: zenoss/trunk/debian/control
===================================================================
--- zenoss/trunk/debian/control 2007-04-19 21:28:37 UTC (rev 819)
+++ zenoss/trunk/debian/control 2007-04-19 21:42:21 UTC (rev 820)
@@ -39,16 +39,6 @@
.
Homepage: http://zenoss.com/
-Package: zenoss-plugins
-Architecture: all
-Depends: ${python:Depends}
-Suggests: nagios-plugins
-Description: Plugins for Zenoss
- The zenoss plugins collect information about a computer's
- CPU, memory, disk, io, or process activity and reports it
- in name-value pair format. These name-value pairs can be
- graphed in the Zenoss web application.
-
Package: zenoss-doc
Section: doc
Architecture: all
Modified: zenoss/trunk/debian/patches/00list
===================================================================
--- zenoss/trunk/debian/patches/00list 2007-04-19 21:28:37 UTC (rev 819)
+++ zenoss/trunk/debian/patches/00list 2007-04-19 21:42:21 UTC (rev 820)
@@ -1,4 +1,3 @@
pdis-distutils
testgen-distutils
-zenplugins-distutils
pysnmp-v3-for-Products
Deleted: zenoss/trunk/debian/patches/zenplugins-distutils.dpatch
===================================================================
--- zenoss/trunk/debian/patches/zenplugins-distutils.dpatch 2007-04-19 21:28:37 UTC (rev 819)
+++ zenoss/trunk/debian/patches/zenplugins-distutils.dpatch 2007-04-19 21:42:21 UTC (rev 820)
@@ -1,18 +0,0 @@
-#! /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"
Modified: zenoss/trunk/debian/rules
===================================================================
--- zenoss/trunk/debian/rules 2007-04-19 21:28:37 UTC (rev 819)
+++ zenoss/trunk/debian/rules 2007-04-19 21:42:21 UTC (rev 820)
@@ -5,8 +5,8 @@
export DH_VERBOSE=1
# 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)
+VERSION := $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,-.*,,g')
+ZENOSS_SVN := http://dev.zenoss.com/svn/tags/zenoss-$(VERSION)
# Include dpatch stuff.
@@ -29,8 +29,7 @@
dh_testroot
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 {} \;
+ find testgen PDIS-XPath-0.3 -name \*.pyc -exec rm -f {} \;
dh_clean
rm -f build-stamp
@@ -47,11 +46,6 @@
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
- mv $(CURDIR)/debian/zenoss-plugins/usr/bin/zenplugin.py \
- $(CURDIR)/debian/zenoss-plugins/usr/bin/zenplugin
dh_install -i -XLICENSE.txt -XCOPYRIGHT.txt -Xlicense.txt
cp debian/zenoss.lintian-overrides $(CURDIR)/debian/zenoss/usr/share/lintian/overrides/zenoss
@@ -98,7 +92,7 @@
sed 's,Products/,,g' | \
while read product; do \
prodfile=debian/zenoss.dzproduct.$$product ;\
- if ! test -e $$prodfile; then \
+ if [ ! -e $$prodfile ]; then \
echo "Package: zenoss" > $$prodfile ;\
echo "Name: $$product" >>$$prodfile ;\
echo "Depends: ####FIXME####" >>$$prodfile ;\
@@ -109,25 +103,97 @@
# get-orig-source will drop the orig.tar.gz in
# ../tarballs, if the directory exists
+
get-orig-source:
set -e ;\
- if test -d ../tarballs; then \
+ if [ -d ../tarballs ]; then \
packbase="../tarballs" ;\
+ else packbase="." ;\
+ fi ;\
+ tarball="zenoss_$(VERSION).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 ;\
+ packdir="$$packbase/zenoss-$(VERSION).orig" ;\
+ if [ -d $$packdir ]; then \
+ echo "Please remove $$packdir first" ;\
+ fi ;\
+ mkdir -p $$packdir ;\
+ upstream_tarball=zenoss-$(VERSION).tar.gz ;\
+ if [ ! -e $$upstream_tarball ]; then \
+ wget http://downloads.sourceforge.net/zenoss/zenoss-$(VERSION).tar.gz ;\
+ fi ;\
+ tar xfz zenoss-$(VERSION).tar.gz ;\
+ srcdir=$(CURDIR)/zenoss-$(VERSION) ;\
+ pushd . ;\
+ cd $$packdir ;\
+ find $$srcdir -mindepth 1 -maxdepth 1 -type f -exec mv "{}" . \; ;\
+ rm *.spec ;\
+ tar xfz $$srcdir/libzenoss/bin.tar.gz ;\
+ if [ ! -d $$srcdir/fs ]; then \
+ mkdir -p fs/etc ;\
+ mv $$srcdir/cron/* fs/etc ;\
+ mv $$srcdir/logrotate.d fs/etc ;\
+ else \
+ mv $$srcdir/fs . ;\
+ fi ;\
+ tar xfz $$srcdir/externallibs/PDIS-XPath-0.3.tar.gz ;\
+ tar xfj $$srcdir/externallibs/testgen-0.0-r3649.tar.bz2 ;\
+ mv testgen-* testgen ;\
+ tar xfz $$srcdir/libzenoss/Products.tar.gz ;\
+ 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/dtml/.addDataCollector.dtml.swp ;\
+ rm -f docs/BUILD_* ;\
+ rm -f docs/INSTALL_* ;\
+ rm -f docs/UPGRADE.txt ;\
+ rm -f docs/CompatibilityMatrix.txt ;\
+ rm -f docs/ZenossVirtualAppliance.txt ;\
+ rm -f docs/*.doc ;\
+ rm -f docs/ZenossAdminGuide-1.0.0.pdf ;\
+ rm -f docs/ZenossQStart-1.0.pdf ;\
+ find . -name \.cvsignore -exec rm -f {} \; ;\
+ find . -name \.svnignore -exec rm -f {} \; ;\
+ find testgen PDIS-XPath-0.3 docs -type f -perm /100 -print0 | \
+ xargs -0 chmod 0644 ;\
+ cd .. ;\
+ tar cvf - zenoss-$(VERSION).orig | gzip --best - \
+ > $$tarball ;\
+ rm -rf zenoss-$(VERSION).orig ;\
+ popd ;\
+ rm -rf $$srcdir
+
+
+
+get-orig-source-from-svn:
+ set -e ;\
+ if [ -d ../tarballs ]; then \
+ packbase="../tarballs" ;\
else packbase="." ;\
fi ;\
- tarball="zenoss_$(ZENOSS_VERSION).orig.tar.gz" ;\
- if test -e $$packbase/$$tarball; then \
+ tarball="zenoss_$(VERSION).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 ;\
pushd . ;\
- packdir="$$packbase/zenoss-$(ZENOSS_VERSION).orig" ;\
+ packdir="$$packbase/zenoss-$(VERSION).orig" ;\
+ if [ -d $$packdir ]; then \
+ echo "Please remove $$packdir first" ;\
+ fi ;\
mkdir -p $$packdir ;\
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 ;\
@@ -141,12 +207,12 @@
rm -rf Products/PluginRegistry/ ;\
rm -f Products/DataCollector/dtml/.addDataCollector.dtml.swp ;\
svn -N export $(ZENOSS_SVN)/inst ;\
- pushd . ;\
- cd inst/ ;\
+ mv inst/* . ;\
+ rmdir 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 \
+ if [ ! -d fs ]; then \
mkdir -p fs/etc ;\
svn export $(ZENOSS_SVN)/inst/cron ;\
svn export $(ZENOSS_SVN)/inst/logrotate.d ;\
@@ -163,14 +229,14 @@
rm -f docs/*.doc ;\
rm -f docs/ZenossAdminGuide-1.0.0.pdf ;\
rm -f docs/ZenossQStart-1.0.pdf ;\
- 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 {} \; ;\
+ find testgen PDIS-XPath-0.3 docs -type f -perm /100 -print0 | \
+ xargs -0 chmod 0644 ;\
cd .. ;\
- tar cvf - zenoss-$(ZENOSS_VERSION).orig | gzip --best - \
+ tar cvf - zenoss-$(VERSION).orig | gzip --best - \
> $$tarball ;\
- rm -rf zenoss-$(ZENOSS_VERSION).orig ;\
+ rm -rf zenoss-$(VERSION).orig ;\
popd
#
##############################################################################
Modified: zenoss/trunk/debian/zenoss-doc.install
===================================================================
--- zenoss/trunk/debian/zenoss-doc.install 2007-04-19 21:28:37 UTC (rev 819)
+++ zenoss/trunk/debian/zenoss-doc.install 2007-04-19 21:42:21 UTC (rev 820)
@@ -1 +1 @@
-inst/docs/* /usr/share/doc/zenoss
+docs/* /usr/share/doc/zenoss
More information about the pkg-zope-commits
mailing list