[Pkg-zenoss-commits] r166 - in /packages/zenoss/trunk/debian: mysql-conf.header.sql rules sql/ sql/mysql-conf.header.sql zenoss-doc.install zenoss-zensocket.install zenoss.install

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Jun 19 15:30:08 2007
New Revision: 166

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=166
Log:
use dh_install properly to avoid creating dirs by mistake

Added:
    packages/zenoss/trunk/debian/sql/
    packages/zenoss/trunk/debian/sql/mysql-conf.header.sql
      - copied, changed from r165, packages/zenoss/trunk/debian/mysql-conf.header.sql
Removed:
    packages/zenoss/trunk/debian/mysql-conf.header.sql
Modified:
    packages/zenoss/trunk/debian/rules
    packages/zenoss/trunk/debian/zenoss-doc.install
    packages/zenoss/trunk/debian/zenoss-zensocket.install
    packages/zenoss/trunk/debian/zenoss.install

Modified: packages/zenoss/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules?rev=166&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules (original)
+++ packages/zenoss/trunk/debian/rules Tue Jun 19 15:30:08 2007
@@ -23,7 +23,7 @@
 # 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
 SQL_SNIPPETS =	\
-	debian/mysql-conf.header.sql		\
+	debian/sql/mysql-conf.header.sql	\
 	Products/ZenEvents/db/zenevents.sql	\
 	Products/ZenEvents/db/zenprocs.sql	\
 	$(NULL)
@@ -46,7 +46,8 @@
 	dh_testdir
 	cd PDIS-XPath-0.3; $(PYTHON) setup.py build
 	cd testgen; $(PYTHON) setup.py build
-	cat $(SQL_SNIPPETS) > debian/mysql-conf.sql
+	cat $(SQL_SNIPPETS) > debian/sql/mysql
+	cp debian/zenoss.bashrc debian/.bashrc
 	touch $@
 
 clean: clean-arch clean-indep unpatch
@@ -65,7 +66,9 @@
 	[ -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/mysql-conf.sql
+	rm -f debian/sql/mysql debian/.bashrc
+
+install: install-indep install-arch
 
 install-arch: build-arch
 	dh_testdir

Copied: packages/zenoss/trunk/debian/sql/mysql-conf.header.sql (from r165, packages/zenoss/trunk/debian/mysql-conf.header.sql)
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/sql/mysql-conf.header.sql?rev=166&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/mysql-conf.header.sql (original)
+++ packages/zenoss/trunk/debian/sql/mysql-conf.header.sql Tue Jun 19 15:30:08 2007
@@ -1,1 +1,2 @@
 grant super, file on *.* to _DBC_DBUSER_ at _DBC_DBSERVER_; 
+

Modified: packages/zenoss/trunk/debian/zenoss-doc.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss-doc.install?rev=166&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss-doc.install (original)
+++ packages/zenoss/trunk/debian/zenoss-doc.install Tue Jun 19 15:30:08 2007
@@ -1,7 +1,7 @@
-inst/docs/HOWTO-APC.txt /usr/share/doc/zenoss
-inst/docs/HowToWriteAReport.txt /usr/share/doc/zenoss
-inst/docs/Syslog-HOWTO.txt /usr/share/doc/zenoss
-inst/docs/ZenPackNotes.txt /usr/share/doc/zenoss
-inst/docs/ZenPack.txt /usr/share/doc/zenoss
-inst/docs/HelloWorldZenPack /usr/share/doc/zenoss
-zendocs/ZenossAdminGuide-1.1.pdf /usr/share/doc/zenoss
+inst/docs/HOWTO-APC.txt			usr/share/doc/zenoss/
+inst/docs/HowToWriteAReport.txt		usr/share/doc/zenoss/
+inst/docs/Syslog-HOWTO.txt		usr/share/doc/zenoss/
+inst/docs/ZenPackNotes.txt		usr/share/doc/zenoss
+inst/docs/ZenPack.txt			usr/share/doc/zenoss
+inst/docs/HelloWorldZenPack		usr/share/doc/zenoss
+zendocs/ZenossAdminGuide-1.1.pdf	usr/share/doc/zenoss

Modified: packages/zenoss/trunk/debian/zenoss-zensocket.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss-zensocket.install?rev=166&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss-zensocket.install (original)
+++ packages/zenoss/trunk/debian/zenoss-zensocket.install Tue Jun 19 15:30:08 2007
@@ -1,1 +1,1 @@
-inst/zensocket/zensocket	/usr/lib/zenoss/bin
+inst/zensocket/zensocket	usr/lib/zenoss/bin/

Modified: packages/zenoss/trunk/debian/zenoss.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss.install?rev=166&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss.install (original)
+++ packages/zenoss/trunk/debian/zenoss.install Tue Jun 19 15:30:08 2007
@@ -1,5 +1,5 @@
-Products/*			/usr/share/zope/Products/
-inst/conf/*			/usr/lib/zenoss/skel/etc/
-bin/*				/usr/lib/zenoss/skel/bin/
-debian/zenoss.bashrc		/usr/lib/zenoss/skel/.bashrc
-debian/mysql-conf.sql		/usr/share/dbconfig-common/data/zenoss/install-dbadmin/mysql
+Products/*		usr/share/zope/Products/
+inst/conf/*		usr/lib/zenoss/skel/etc/
+bin/*			usr/lib/zenoss/skel/bin/
+debian/.bashrc		usr/lib/zenoss/skel/
+debian/sql/mysql	usr/share/dbconfig-common/data/zenoss/install-dbadmin/