[Pkg-zenoss-commits] r164 - in /packages/zenoss/trunk/debian: control mysql-conf.header.sql rules zenoss.dirs zenoss.install

[zack at users.alioth.debian.org]

Author: zack
Date: Tue Jun 19 14:53:14 2007
New Revision: 164

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=164
Log:
first draft of the dbconfig stuff (probably not working you have been warned :)

Added:
    packages/zenoss/trunk/debian/mysql-conf.header.sql
Modified:
    packages/zenoss/trunk/debian/control
    packages/zenoss/trunk/debian/rules
    packages/zenoss/trunk/debian/zenoss.dirs
    packages/zenoss/trunk/debian/zenoss.install

Modified: packages/zenoss/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/control?rev=164&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/control (original)
+++ packages/zenoss/trunk/debian/control Tue Jun 19 14:53:14 2007
@@ -11,7 +11,6 @@
 
 Package: zenoss
 Architecture: all
-Pre-Depends: debconf-2.0
 Depends: ${python:Depends}, ${misc:Depends}, ${zope:Depends},
  adduser, dbconfig-common, snmp,
  python-elementtree (>= 1.2.6), python-epydoc (>= 2.1),

Added: packages/zenoss/trunk/debian/mysql-conf.header.sql
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/mysql-conf.header.sql?rev=164&op=file
==============================================================================
--- packages/zenoss/trunk/debian/mysql-conf.header.sql (added)
+++ packages/zenoss/trunk/debian/mysql-conf.header.sql Tue Jun 19 14:53:14 2007
@@ -1,0 +1,1 @@
+grant super, file on *.* to _DBC_DBUSER_ at _DBC_DBSERVER_; 

Modified: packages/zenoss/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules?rev=164&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules (original)
+++ packages/zenoss/trunk/debian/rules Tue Jun 19 14:53:14 2007
@@ -20,6 +20,14 @@
 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')
 
+# 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		\
+	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)
@@ -38,6 +46,7 @@
 	dh_testdir
 	cd PDIS-XPath-0.3; $(PYTHON) setup.py build
 	cd testgen; $(PYTHON) setup.py build
+	cat $(SQL_SNIPPETS) > debian/mysql-conf.sql
 	touch $@
 
 clean: clean-arch clean-indep unpatch
@@ -56,7 +65,7 @@
 	[ -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
 
 install-arch: build-arch
 	dh_testdir

Modified: packages/zenoss/trunk/debian/zenoss.dirs
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss.dirs?rev=164&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss.dirs (original)
+++ packages/zenoss/trunk/debian/zenoss.dirs Tue Jun 19 14:53:14 2007
@@ -1,1 +1,2 @@
 usr/lib/zenoss
+usr/share/dbconfig-common/data/zenoss/install-dbadmin/mysql

Modified: packages/zenoss/trunk/debian/zenoss.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss.install?rev=164&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss.install (original)
+++ packages/zenoss/trunk/debian/zenoss.install Tue Jun 19 14:53:14 2007
@@ -1,4 +1,5 @@
 Products/*			/usr/share/zope/Products/
-inst/conf/*			/usr/lib/zenoss/skel/etc
-bin/*				/usr/lib/zenoss/skel/bin
+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/