[Pkg-zenoss-commits] r330 - in /trunk/packages/zenoss/debian: control rules rules-extras.mk zenoss.manpages

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Fri Nov 30 18:29:55 2007
New Revision: 330

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=330
Log:
-cleaning not needed manpages
-updating control as we need mysqldb >=1.2.2-5

Removed:
    trunk/packages/zenoss/debian/zenoss.manpages
Modified:
    trunk/packages/zenoss/debian/control
    trunk/packages/zenoss/debian/rules
    trunk/packages/zenoss/debian/rules-extras.mk

Modified: trunk/packages/zenoss/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/control?rev=330&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/control (original)
+++ trunk/packages/zenoss/debian/control Fri Nov 30 18:29:55 2007
@@ -15,7 +15,7 @@
 Depends: ${python:Depends}, ${misc:Depends}, 
  adduser, dbconfig-common (>= 1.8.36), snmp, rsync,
  python-elementtree (>= 1.2.6), python-epydoc (>= 2.1),
- python-mysqldb (>= 1.2.0), python-pyip,
+ python-mysqldb (>= 1.2.2-5), python-pyip,
  python-pydot (>= 0.9.10), python-simplejson (>= 1.4),
  python-rrd, python-twisted (>= 2.5.0),
  python-pynetsnmp (>=0.26.8), python-wmi (>= 1:0.1.4),

Modified: trunk/packages/zenoss/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules?rev=330&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules (original)
+++ trunk/packages/zenoss/debian/rules Fri Nov 30 18:29:55 2007
@@ -26,12 +26,6 @@
 	Products/ZenEvents/db/zenprocs.sql	\
 	$(NULL)
 
-DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-XP=xsltproc -''-nonet
-MANPAGES=debian/testgen-convert.1 debian/testgen-twill.1
-
-manpages: $(MANPAGES)
-
 debian/%.1: debian/%.xml
 	$(XP) -o $@ $(DB2MAN) $<
 
@@ -46,10 +40,8 @@
 	touch $@
 
 
-build-indep-stamp: patch check-dzhandles manpages
+build-indep-stamp: patch check-dzhandles 
 	dh_testdir
-	cd PDIS-XPath-0.3; $(PYTHON) setup.py build
-	cd testgen; $(PYTHON) setup.py build
 	test -d debian/sql.install || \
 		mkdir -p debian/sql.install/install-dbadmin/ debian/sql.install/remove/
 	cat $(INST_SQL_SNIPPETS) > debian/sql.install/install-dbadmin/mysql
@@ -72,9 +64,6 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp-indep
-	[ -d PDIS-XPath-0.3 ] && (cd PDIS-XPath-0.3; $(PYTHON) setup.py clean -a) || true
-	[ -d testgen ] && (cd testgen; $(PYTHON) setup.py clean -a) || true
-	[ -d PDIS-XPath-0.3 ] && (find testgen PDIS-XPath-0.3 -name \*.pyc -exec rm -f {} \;) || true
 	rm -f debian/.bashrc debian/.bash_profile
 	rm -rf debian/sql.install/
 
@@ -92,13 +81,6 @@
 	dh_testroot
 	dh_clean -k -i 
 	dh_installdirs -i
-	cd PDIS-XPath-0.3; $(PYTHON) setup.py install \
-		--root=$(CURDIR)/debian/zenoss \
-		--install-purelib=/usr/share/python-support/zenoss \
-		--no-compile 
-	cd testgen; $(PYTHON) setup.py install --root $(CURDIR)/debian/zenoss \
-		--install-purelib=/usr/share/python-support/zenoss \
-		--no-compile
 	dh_install -i -Nzenoss
 	cp -pr /usr/lib/$(ZOPE)/skel $(CURDIR)/debian/zenoss/usr/share/zenoss
 	rm -f $(CURDIR)/debian/zenoss/usr/share/zenoss/skel/import/*.zexp
@@ -116,10 +98,6 @@
 	sed -i '2 iPYSNMP_API_VERSION="v3"; export PYSNMP_API_VERSION' \
                $(CURDIR)/debian/zenoss/usr/share/zenoss/skel/bin/zopectl.in
 
-
-	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
 	dh_testdir
@@ -146,7 +124,6 @@
 	dh_pysupport -i
 	dh_installzope -i
 	dh_installzopeinstance -pzenoss zenoss
-	dh_installman -i
 	dh_installcron -i
 	dh_link -i
 	dh_compress -i -XZenossAdminGuide2-0.pdf
@@ -161,7 +138,6 @@
 
 binary: binary-arch binary-indep
 
-.PHONY: manpages
 .PHONY: build build-indep build-arch clean clean-indep clean-arch
 .PHONY: binary-indep binary-arch binary install
 .PHONY: patch unpatch

Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=330&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Fri Nov 30 18:29:55 2007
@@ -160,7 +160,8 @@
 	              Products/ZenRRD/RRDDaemon.py \
 	              Products/ZenRRD/zenperfsnmp.py \
 	              Products/ZenRRD/zenrender.py \
-	              Products/ZenReports/ReportMail.py ;\
+	              Products/ZenReports/ReportMail.py \
+	              Products/ZenUtils/ZenBackupBase.py ;\
 	    chmod 644 Products/ZenWidgets/skins/zenui/flex/*.mxml ;\
 	echo "packaging the orig.tar.gz and cleaning up" ;\
 	    cd $$packdir/.. ;\