[Pkg-zenoss-commits] r275 - in /trunk/packages/zenoss/debian: changelog rules sql/mysql-remove.sql zenoss.install zenoss.prerm

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Aug 12 22:53:01 2007
New Revision: 275

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=275
Log:
- add missing runlevel 2 to dh_installinit
- draft of sql removal code

Added:
    trunk/packages/zenoss/debian/sql/mysql-remove.sql
Modified:
    trunk/packages/zenoss/debian/changelog
    trunk/packages/zenoss/debian/rules
    trunk/packages/zenoss/debian/zenoss.install
    trunk/packages/zenoss/debian/zenoss.prerm

Modified: trunk/packages/zenoss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/changelog?rev=275&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/changelog (original)
+++ trunk/packages/zenoss/debian/changelog Sun Aug 12 22:53:01 2007
@@ -1,5 +1,5 @@
 zenoss (2.0.4-0) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #361253)
+  * Initial release (closes: #361253)
 
- -- Bernd Zeimetz <bernd at bzed.de>  Mon, 09 Jul 2007 15:42:56 +0200
+ -- Stefano Zacchiroli <zack at debian.org>  Mon, 13 Aug 2007 00:38:21 +0200

Modified: trunk/packages/zenoss/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules?rev=275&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules (original)
+++ trunk/packages/zenoss/debian/rules Sun Aug 12 22:53:01 2007
@@ -20,13 +20,11 @@
 
 # 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 =	\
+INST_SQL_SNIPPETS =	\
 	debian/sql/mysql-conf.header.sql	\
 	Products/ZenEvents/db/zenevents.sql	\
 	Products/ZenEvents/db/zenprocs.sql	\
 	$(NULL)
-
-
 
 DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 XP=xsltproc -''-nonet
@@ -52,7 +50,10 @@
 	dh_testdir
 	cd PDIS-XPath-0.3; $(PYTHON) setup.py build
 	cd testgen; $(PYTHON) setup.py build
-	cat $(SQL_SNIPPETS) > debian/sql/mysql
+	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
+	cp debian/sql/mysql-remove.sql debian/sql.install/remove/mysql
 	cp debian/zenoss.bashrc debian/.bashrc
 	touch $@
 
@@ -73,7 +74,8 @@
 	[ -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/sql/mysql debian/.bashrc
+	rm -f debian/.bashrc
+	rm -rf debian/sql.install/
 
 install: install-indep install-arch
 
@@ -149,7 +151,7 @@
 	dh_compress -i -XZenossAdminGuide2-0.pdf
 	dh_fixperms -i
 	dh_installdebconf -i
-	dh_installinit -i --no-start -u'start 21 3 4 5 . stop 21 0 1 6 .'
+	dh_installinit -i --no-start -u'start 21 2 3 4 5 . stop 21 0 1 6 .'
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i

Added: trunk/packages/zenoss/debian/sql/mysql-remove.sql
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/sql/mysql-remove.sql?rev=275&op=file
==============================================================================
--- trunk/packages/zenoss/debian/sql/mysql-remove.sql (added)
+++ trunk/packages/zenoss/debian/sql/mysql-remove.sql Sun Aug 12 22:53:01 2007
@@ -1,0 +1,1 @@
+revoke super, file on *.* from _DBC_DBUSER_ at _DBC_DBSERVER_;

Modified: trunk/packages/zenoss/debian/zenoss.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.install?rev=275&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.install (original)
+++ trunk/packages/zenoss/debian/zenoss.install Sun Aug 12 22:53:01 2007
@@ -2,4 +2,4 @@
 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/
+debian/sql.install/*	usr/share/dbconfig-common/data/zenoss/

Modified: trunk/packages/zenoss/debian/zenoss.prerm
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.prerm?rev=275&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.prerm (original)
+++ trunk/packages/zenoss/debian/zenoss.prerm Sun Aug 12 22:53:01 2007
@@ -1,7 +1,8 @@
 #!/bin/bash
-
 set -e
 
+. /usr/share/debconf/confmodule
+. /usr/share/dbconfig-common/dpkg/prerm.mysql
 
 #stop zenoss daemons first. If we fail, the user needs to fix it.
 #they should not keep running while the ZEO is being shut down.
@@ -14,6 +15,9 @@
         fi
 fi
 
+dbc_sql_substitutions=true
+dbc_go zenoss $@
+
 #DEBHELPER#
 
 #clean up cache directory