r809 - zenoss/trunk/debian

[Bernd Zeimetz]

Author: bzed-guest
Date: 2007-04-13 23:41:11 +0000 (Fri, 13 Apr 2007)
New Revision: 809

Added:
   zenoss/trunk/debian/zenoss.install
Modified:
   zenoss/trunk/debian/control
   zenoss/trunk/debian/rules
   zenoss/trunk/debian/zenoss-doc.doc-base
Log:
... :)


Modified: zenoss/trunk/debian/control
===================================================================
--- zenoss/trunk/debian/control	2007-04-13 23:12:40 UTC (rev 808)
+++ zenoss/trunk/debian/control	2007-04-13 23:41:11 UTC (rev 809)
@@ -50,6 +50,7 @@
  graphed in the Zenoss web application.
 
 Package: zenoss-doc
+Section: doc
 Architecture: all
 Description: Documentation for Zenoss
  This package contains the documentation for Zenoss, mainly

Modified: zenoss/trunk/debian/rules
===================================================================
--- zenoss/trunk/debian/rules	2007-04-13 23:12:40 UTC (rev 808)
+++ zenoss/trunk/debian/rules	2007-04-13 23:41:11 UTC (rev 809)
@@ -50,7 +50,7 @@
 	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
+	dh_install -i -XLICENSE.txt -XCOPYRIGHT.txt
 
 
 binary-indep: 
@@ -66,7 +66,7 @@
 #	dh_installpam
 #	dh_installmime
 	dh_pysupport -pzenoss-plugins
-	dh_installzope Products/*
+	dh_installzope 
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
@@ -103,8 +103,10 @@
 		done
 
 
-get-orig-source: clean
-	if test -d ./tarballs; then \
+# get-orig-source will drop the orig.tar.gz in
+# ../tarballs, if the directory exists
+get-orig-source:
+	if test -d ../tarballs; then \
 		packbase="../tarballs" ;\
 	else	packbase="." ;\
 	fi ;\
@@ -132,6 +134,7 @@
 	rm -rf Products/Five/ ;\
 	rm -rf Products/PluggableAuthService/ ;\
 	rm -rf Products/PluginRegistry/ ;\
+	rm -f  Products/DataCollector/dtml/.addDataCollector.dtml.swp ;\
 	svn -N export $(ZENOSS_SVN)/inst ;\
 	pushd . ;\
 	cd inst/ ;\

Modified: zenoss/trunk/debian/zenoss-doc.doc-base
===================================================================
--- zenoss/trunk/debian/zenoss-doc.doc-base	2007-04-13 23:12:40 UTC (rev 808)
+++ zenoss/trunk/debian/zenoss-doc.doc-base	2007-04-13 23:41:11 UTC (rev 809)
@@ -8,4 +8,4 @@
 Section: Apps/System
 
 Format: PDF
-Files: /usr/share/doc/zenoss/ZenossAdminGuide-1.1.pdf
+Files: /usr/share/doc/zenoss/ZenossAdminGuide-1.1.pdf.gz

Added: zenoss/trunk/debian/zenoss.install
===================================================================
--- zenoss/trunk/debian/zenoss.install	2007-04-13 23:12:40 UTC (rev 808)
+++ zenoss/trunk/debian/zenoss.install	2007-04-13 23:41:11 UTC (rev 809)
@@ -0,0 +1 @@
+Products/* /usr/share/zope/Products/