[Pkg-voip-commits] r6424 - in /freepbx/branches/dbconfig-common/debian: freepbx-common.config freepbx-common.dirs freepbx-common.install freepbx-common.postinst freepbx-common.prerm rules

[odd_bloke-guest at alioth.debian.org]

Author: odd_bloke-guest
Date: Thu Nov 13 15:48:11 2008
New Revision: 6424

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6424
Log:
Clean up maintainer scripts.

Modified:
    freepbx/branches/dbconfig-common/debian/freepbx-common.config
    freepbx/branches/dbconfig-common/debian/freepbx-common.dirs
    freepbx/branches/dbconfig-common/debian/freepbx-common.install
    freepbx/branches/dbconfig-common/debian/freepbx-common.postinst
    freepbx/branches/dbconfig-common/debian/freepbx-common.prerm
    freepbx/branches/dbconfig-common/debian/rules

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.config
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.config?rev=6424&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.config (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.config Thu Nov 13 15:48:11 2008
@@ -7,5 +7,5 @@
 # source dbconfig-common shell library, and call the hook function
 if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
    . /usr/share/dbconfig-common/dpkg/config.mysql
-   dbc_go freepbx-common $@
+   dbc_dbname=asterisk dbc_go freepbx-common $@
 fi

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.dirs?rev=6424&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.dirs (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.dirs Thu Nov 13 15:48:11 2008
@@ -17,3 +17,4 @@
 var/spool/asterisk/fax/
 var/spool/asterisk/monitor/
 usr/share/lintian/overrides/
+usr/share/dbconfig-common/data/freepbx-common/install

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.install
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.install?rev=6424&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.install (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.install Thu Nov 13 15:48:11 2008
@@ -23,7 +23,5 @@
 debian/share/update-freepbx				usr/sbin/
 debian/share/post-reload/*				usr/share/freepbx-common/post-reload/
 
-SQL/newinstall.sql						usr/share/dbconfig-common/data/freepbx-common/install/mysql
-
 debian/apache2						etc/
 debian/share/amportal.conf.template      usr/share/freepbx-common/

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.postinst?rev=6424&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.postinst (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.postinst Thu Nov 13 15:48:11 2008
@@ -78,8 +78,8 @@
 }
 
 . /usr/share/debconf/confmodule
-if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
-    . /usr/share/dbconfig-common/dpkg/config.mysql
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.mysql ]; then
+    . /usr/share/dbconfig-common/dpkg/postinst.mysql
     dbc_go freepbx-common $@
     dbconfig-generate-include -f template -o template_infile=/usr/share/freepbx-common/amportal.conf.template /etc/dbconfig-common/freepbx-common.conf > /etc/amportal.conf
 fi

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.prerm
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.prerm?rev=6424&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.prerm (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.prerm Thu Nov 13 15:48:11 2008
@@ -1,13 +1,13 @@
 #!/bin/sh
-# config maintainer script for freepbx-common
+# prerm maintainer script for freepbx-common
 
 set -e
 
 # source debconf stuff
 . /usr/share/debconf/confmodule
 # source dbconfig-common shell library, and call the hook function
-if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
-   . /usr/share/dbconfig-common/dpkg/config.mysql
+if [ -f /usr/share/dbconfig-common/dpkg/prerm.mysql ]; then
+   . /usr/share/dbconfig-common/dpkg/prerm.mysql
    dbc_go freepbx-common $@
 fi
 

Modified: freepbx/branches/dbconfig-common/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/rules?rev=6424&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/rules (original)
+++ freepbx/branches/dbconfig-common/debian/rules Thu Nov 13 15:48:11 2008
@@ -108,6 +108,7 @@
 	cp debian/freepbx-common.lintian  $(CURDIR)/debian/freepbx-common/usr/share/lintian/overrides/freepbx-common
 	cp debian/asterisk-sounds-moh-freepbx.lintian  $(CURDIR)/debian/asterisk-sounds-moh-freepbx/usr/share/lintian/overrides/asterisk-sounds-moh-freepbx
 #	chmod +x debian/freepbx-common/usr/sbin/update-freepbx
+	cp SQL/newinstall.sql debian/freepbx-common/usr/share/dbconfig-common/data/freepbx-common/install/mysql
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep