[Pkg-voip-commits] r3629 - / asterisk1.2 asterisk1.2/tags asterisk1.2/trunk/debian libpri1.2 libpri1.2/tags libpri1.2/trunk/debian zaptel1.2 zaptel1.2/tags zaptel1.2/trunk/debian
kilian at alioth.debian.org
kilian at alioth.debian.org
Thu May 31 17:02:53 UTC 2007
Author: kilian
Date: 2007-05-31 17:02:53 +0000 (Thu, 31 May 2007)
New Revision: 3629
Added:
asterisk1.2/
asterisk1.2/build-area
asterisk1.2/tags/
asterisk1.2/tags/build-area
asterisk1.2/tags/tarballs
asterisk1.2/tarballs
asterisk1.2/trunk/
asterisk1.2/trunk/debian/asterisk1.2-bristuff.install
asterisk1.2/trunk/debian/asterisk1.2-bristuff.links
asterisk1.2/trunk/debian/asterisk1.2-classic.install
asterisk1.2/trunk/debian/asterisk1.2-classic.links
asterisk1.2/trunk/debian/asterisk1.2-config.install
asterisk1.2/trunk/debian/asterisk1.2-config.postinst
asterisk1.2/trunk/debian/asterisk1.2-dev.install
asterisk1.2/trunk/debian/asterisk1.2-doc.docs
asterisk1.2/trunk/debian/asterisk1.2-doc.examples
asterisk1.2/trunk/debian/asterisk1.2-gtk-console.install
asterisk1.2/trunk/debian/asterisk1.2-h323.install
asterisk1.2/trunk/debian/asterisk1.2-sounds-main.docs
asterisk1.2/trunk/debian/asterisk1.2-sounds-main.install
asterisk1.2/trunk/debian/asterisk1.2-sounds.install
asterisk1.2/trunk/debian/asterisk1.2-web-vmail.install
asterisk1.2/trunk/debian/asterisk1.2.default
asterisk1.2/trunk/debian/asterisk1.2.init
asterisk1.2/trunk/debian/asterisk1.2.logrotate
asterisk1.2/trunk/debian/asterisk1.2.postrm
asterisk1.2/trunk/debian/asterisk1.2_fix
libpri1.2/
libpri1.2/build-area
libpri1.2/tags/
libpri1.2/tags/build-area
libpri1.2/tags/tarballs
libpri1.2/tarballs
libpri1.2/trunk/
libpri1.2/trunk/debian/libpri1.2-dev.dirs
libpri1.2/trunk/debian/libpri1.2-dev.files
zaptel1.2/
zaptel1.2/build-area
zaptel1.2/tags/
zaptel1.2/tags/build-area
zaptel1.2/tags/tarballs
zaptel1.2/tarballs
zaptel1.2/trunk/
zaptel1.2/trunk/debian/libtonezone1.2-dev.install
zaptel1.2/trunk/debian/libtonezone1.2-dev.links
zaptel1.2/trunk/debian/libtonezone1.2.docs
zaptel1.2/trunk/debian/libtonezone1.2.install
zaptel1.2/trunk/debian/libtonezone1.2.links
zaptel1.2/trunk/debian/zaptel1.2-modules.modules
zaptel1.2/trunk/debian/zaptel1.2-source.dirs
zaptel1.2/trunk/debian/zaptel1.2.dirs
zaptel1.2/trunk/debian/zaptel1.2.init
zaptel1.2/trunk/debian/zaptel1.2.install
zaptel1.2/trunk/debian/zaptel1.2.lintian
zaptel1.2/trunk/debian/zaptel1.2.modprobe.d
zaptel1.2/trunk/debian/zaptel1.2.modules
zaptel1.2/trunk/debian/zaptel1.2.postinst
zaptel1.2/trunk/debian/zaptel1.2.postrm
zaptel1.2/trunk/debian/zaptel1.2.udev.rules
Removed:
asterisk1.2/trunk/debian/asterisk-bristuff.install
asterisk1.2/trunk/debian/asterisk-bristuff.links
asterisk1.2/trunk/debian/asterisk-classic.install
asterisk1.2/trunk/debian/asterisk-classic.links
asterisk1.2/trunk/debian/asterisk-config.install
asterisk1.2/trunk/debian/asterisk-config.postinst
asterisk1.2/trunk/debian/asterisk-dev.install
asterisk1.2/trunk/debian/asterisk-doc.docs
asterisk1.2/trunk/debian/asterisk-doc.examples
asterisk1.2/trunk/debian/asterisk-gtk-console.install
asterisk1.2/trunk/debian/asterisk-h323.install
asterisk1.2/trunk/debian/asterisk-sounds-main.docs
asterisk1.2/trunk/debian/asterisk-sounds-main.install
asterisk1.2/trunk/debian/asterisk-sounds.install
asterisk1.2/trunk/debian/asterisk-web-vmail.install
asterisk1.2/trunk/debian/asterisk.default
asterisk1.2/trunk/debian/asterisk.init
asterisk1.2/trunk/debian/asterisk.logrotate
asterisk1.2/trunk/debian/asterisk.postrm
asterisk1.2/trunk/debian/asterisk_fix
libpri1.2/trunk/debian/libpri-dev.dirs
libpri1.2/trunk/debian/libpri-dev.files
zaptel1.2/trunk/debian/libtonezone-dev.install
zaptel1.2/trunk/debian/libtonezone-dev.links
zaptel1.2/trunk/debian/libtonezone1.docs
zaptel1.2/trunk/debian/libtonezone1.install
zaptel1.2/trunk/debian/libtonezone1.links
zaptel1.2/trunk/debian/zaptel-modules.modules
zaptel1.2/trunk/debian/zaptel-source.dirs
zaptel1.2/trunk/debian/zaptel.dirs
zaptel1.2/trunk/debian/zaptel.init
zaptel1.2/trunk/debian/zaptel.install
zaptel1.2/trunk/debian/zaptel.lintian
zaptel1.2/trunk/debian/zaptel.modprobe.d
zaptel1.2/trunk/debian/zaptel.modules
zaptel1.2/trunk/debian/zaptel.postinst
zaptel1.2/trunk/debian/zaptel.postrm
zaptel1.2/trunk/debian/zaptel.udev.rules
Modified:
asterisk1.2/trunk/debian/changelog
asterisk1.2/trunk/debian/control
asterisk1.2/trunk/debian/rules
libpri1.2/trunk/debian/changelog
libpri1.2/trunk/debian/control
libpri1.2/trunk/debian/rules
zaptel1.2/trunk/debian/changelog
zaptel1.2/trunk/debian/control
zaptel1.2/trunk/debian/control.modules.in
Log:
Add initial version of asterisk 1.2 series "backport".
Bristuff patch in asterisk still needs to be adjusted for 1.2.18.
Added: asterisk1.2/build-area
===================================================================
--- asterisk1.2/build-area (rev 0)
+++ asterisk1.2/build-area 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../build-area/
\ No newline at end of file
Property changes on: asterisk1.2/build-area
___________________________________________________________________
Name: svn:special
+ *
Added: asterisk1.2/tags/build-area
===================================================================
--- asterisk1.2/tags/build-area (rev 0)
+++ asterisk1.2/tags/build-area 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../../build-area
\ No newline at end of file
Property changes on: asterisk1.2/tags/build-area
___________________________________________________________________
Name: svn:special
+ *
Added: asterisk1.2/tags/tarballs
===================================================================
--- asterisk1.2/tags/tarballs (rev 0)
+++ asterisk1.2/tags/tarballs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../../tarballs/
\ No newline at end of file
Property changes on: asterisk1.2/tags/tarballs
___________________________________________________________________
Name: svn:special
+ *
Added: asterisk1.2/tarballs
===================================================================
--- asterisk1.2/tarballs (rev 0)
+++ asterisk1.2/tarballs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../tarballs
\ No newline at end of file
Property changes on: asterisk1.2/tarballs
___________________________________________________________________
Name: svn:special
+ *
Copied: asterisk1.2/trunk (from rev 3628, asterisk/tags/1.2.16~dfsg-1)
Deleted: asterisk1.2/trunk/debian/asterisk-bristuff.install
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-bristuff.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-bristuff.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,5 +0,0 @@
-bristuff/usr/lib/asterisk usr/lib/
-bristuff/usr/sbin usr/
-bristuff/usr/share/man usr/share/
-bristuff/var/lib/asterisk var/lib/
-usr/share/asterisk/firmware/iax/
Deleted: asterisk1.2/trunk/debian/asterisk-bristuff.links
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-bristuff.links 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-bristuff.links 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-usr/share/man/man8/asterisk.8 usr/share/man/man8/rasterisk.8
Deleted: asterisk1.2/trunk/debian/asterisk-classic.install
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-classic.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-classic.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,4 +0,0 @@
-usr/lib/asterisk
-usr/sbin
-var/lib/asterisk
-usr/share/asterisk/firmware/iax
Deleted: asterisk1.2/trunk/debian/asterisk-classic.links
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-classic.links 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-classic.links 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-usr/share/man/man8/asterisk.8 usr/share/man/man8/rasterisk.8
Deleted: asterisk1.2/trunk/debian/asterisk-config.install
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-config.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-config.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-etc/asterisk
Deleted: asterisk1.2/trunk/debian/asterisk-config.postinst
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-config.postinst 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-config.postinst 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,37 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-
-case "$1" in
- configure)
- if [ -x /usr/share/asterisk/bin/asterisk_fix ]; then
- /usr/share/asterisk/bin/asterisk_fix
- fi
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: asterisk1.2/trunk/debian/asterisk-dev.install
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-dev.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-dev.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-usr/include/asterisk
Deleted: asterisk1.2/trunk/debian/asterisk-doc.docs
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-doc.docs 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-doc.docs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,10 +0,0 @@
-BUGS
-asterisk.sgml
-README
-CREDITS
-HARDWARE
-SECURITY
-doc/*
-contrib
-images/*.gif
-images/*.jpg
Deleted: asterisk1.2/trunk/debian/asterisk-doc.examples
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-doc.examples 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-doc.examples 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,4 +0,0 @@
-sample.call
-configs/*
-muted.conf.sample
-agi/agi-test.agi
Deleted: asterisk1.2/trunk/debian/asterisk-gtk-console.install
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-gtk-console.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-gtk-console.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-usr/lib/asterisk/modules/pbx_gtkconsole.so
Deleted: asterisk1.2/trunk/debian/asterisk-h323.install
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-h323.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-h323.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-usr/lib/asterisk/modules/chan_h323.so
Deleted: asterisk1.2/trunk/debian/asterisk-sounds-main.docs
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-sounds-main.docs 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-sounds-main.docs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-sounds.txt
Deleted: asterisk1.2/trunk/debian/asterisk-sounds-main.install
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-sounds-main.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-sounds-main.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,2 +0,0 @@
-usr/share/asterisk/sounds
-usr/share/asterisk/mohmp3
Deleted: asterisk1.2/trunk/debian/asterisk-sounds.install
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-sounds.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-sounds.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,3 +0,0 @@
-usr/share/asterisk/sounds
-usr/share/asterisk/mohmp3
-var/spool/asterisk
Deleted: asterisk1.2/trunk/debian/asterisk-web-vmail.install
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk-web-vmail.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk-web-vmail.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-usr/lib/cgi-bin/asterisk/vmail.cgi
Deleted: asterisk1.2/trunk/debian/asterisk.default
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk.default 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk.default 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,25 +0,0 @@
-# This file allows you to alter the configuration of the Asterisk
-# init.d script
-#
-# RUNASTERISK: run asterisk upon boot. Should be set to "yes" once you have
-# setup your configuration.
-RUNASTERISK=no
-#
-#
-# AST_REALTIME: if set to anything other than "no", asterisk will run in
-# real-time priority (pass '-p' to asterisk). un-rem the
-# following line to disable asterisk from running in real-time
-# priority
-#AST_REALTIME=yes
-#
-# PARAMS: extra parameters to pass to asterisk
-# The example here may help you in debugging, but is
-# *not**intended**for**production**use*.
-# When you give -G *only* that group will be used,
-# else all groups of the asterisk user.
-#PARAMS="-D -g -vvv"
-#
-#
-# RUNASTSAFE: run safe_asterisk rather than asterisk (will auto-restart upon
-# crash)
-#RUNASTSAFE=yes
Deleted: asterisk1.2/trunk/debian/asterisk.init
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk.init 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk.init 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,190 +0,0 @@
-#! /bin/sh
-#
-# asterisk start the asterisk PBX
-# (c) Mark Purcell <msp at debian.org>
-# May be distributed under the terms of this General Public License
-#
-# Based on:
-#
-# skeleton example file to build /etc/init.d/ scripts.
-# This file should be used to construct scripts for /etc/init.d.
-#
-# Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-# Modified for Debian GNU/Linux
-# by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-#
-# Version: @(#)skeleton 1.9 26-Feb-2001 miquels at cistron.nl
-#
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-NAME=asterisk
-USER=$NAME
-GROUP=$USER
-DAEMON=/usr/sbin/$NAME
-DESC="Asterisk PBX"
-PIDFILE="/var/run/asterisk/asterisk.pid"
-ASTSAFE_PIDFILE="/var/run/asterisk/asterisk_safe.pid"
-UMASK=007 # by default
-
-
-# by default: use real-time priority
-PARAMS=""
-AST_REALTIME="yes"
-RUNASTERISK="yes"
-if [ -r /etc/default/$NAME ]; then . /etc/default/$NAME; fi
-
-if [ "$RUNASTERISK" != "yes" ];then
- echo "Asterisk not yet configured. Edit /etc/default/asterisk first."
- exit 0
-fi
-
-if [ "$AST_REALTIME" != "no" ]
-then
- PARAMS="$PARAMS -p"
-fi
-
-if [ "x$USER" = "x" ]
-then
- echo "Error: empty USER name"
- exit 1
-fi
-if [ `id -u "$USER"` = 0 ]
-then
- echo "Starting as root not supported."
- exit 1
-fi
-PARAMS="$PARAMS -U $USER"
-
-if [ "x$AST_DEBUG_PARAMS" = x ]
-then
- AST_DEBUG_PARAMS=-cvvvvvddddd
-fi
-if [ "$RUNASTSAFE" = "yes" ];then
- # The value of WRAPPER_DAEMON in can be set in /etc/default/asterisk
- WRAPPER_DAEMON=${WRAPPER_DAEMON:-/usr/sbin/safe_asterisk}
- REALDAEMON="$WRAPPER_DAEMON"
-else
- REALDAEMON="$DAEMON"
-fi
-
-test -x $DAEMON || exit 0
-
-set -e
-
-if [ "$UMASK" != '' ]
-then
- umask $UMASK
-fi
-
-status() {
- plist=`ps auxw | grep "$DAEMON" | grep -v grep | awk '{print $2}' | tr '\012' ' '`
- if [ "$plist" = "" ]; then
- echo "$DESC is stopped"
- return 1
- else
- echo "$DESC is running: $plist"
- return 0
- fi
-}
-
-asterisk_rx() {
- if ! status >/dev/null; then return 0; fi
- $DAEMON -rx "$1"
-}
-
-case "$1" in
- debug)
- # we add too many special parameters that I don't want to skip
- # accidentally. I'm afraid that skipping -U once may cause
- # confusing results. I also want to maintain the user's choice
- # of -p
- echo "Debugging $DESC: "
- $DAEMON $PARAMS $AST_DEBUG_PARAMS
- exit 0
- ;;
- start)
- if status > /dev/null; then
- echo "$DESC is already running. Use restart."
- exit 0
- fi
- echo -n "Starting $DESC: "
- if [ "$RUNASTSAFE" != "yes" ];then
- # TODO: what if we cought the wrapper just as its asterisk
- # was killed? status should check for the wrapper if we're in
- # "safe mode"
- if status > /dev/null; then
- echo "$DESC is already running. Use restart."
- exit 0
- fi
- start-stop-daemon --start --group $GROUP --pidfile "$PIDFILE" \
- --exec $REALDAEMON -- $PARAMS
- else
- start-stop-daemon --start --group $GROUP --make-pidfile \
- --pidfile "$ASTSAFE_PIDFILE" \
- --exec $REALDAEMON -- $PARAMS
- fi
-
-
- echo "$NAME."
- ;;
- stop)
- echo -n "Stopping $DESC: "
- if [ "$RUNASTSAFE" = "yes" ];then
- # hopefully this will work. Untested
- $REALDAEMON -rx 'stop now' > /dev/null || true
- else
- # Try gracefully.
- # this may hang in some cases. Specifically, when the asterisk
- # processes is stopped. No bother to worry about cleanup:
- # it will either fail or die when asterisk dies.
- ( $DAEMON -rx 'stop now' > /dev/null 2>&1 & ) &
- fi
- echo -n "$NAME"
- ## giving a small grace time to shut down cleanly.
- #sleep 2 # you can add timeouts in the comma
- if [ "$RUNASTSAFE" = "yes" ];then
- start-stop-daemon --quiet --pidfile $ASTSAFE_PIDFILE --oknodo \
- --stop
- fi
- # just making sure it's really, really dead.
- # KILL is necessary just in case there's an asterisk -r in the background
- start-stop-daemon --stop --quiet --oknodo --retry=0/2/TERM/2/KILL/5 --exec $DAEMON
- echo "."
- ;;
- reload)
- echo "Reloading $DESC configuration files."
- asterisk_rx 'reload'
- ;;
- logger-reload)
- asterisk_rx 'logger reload'
- ;;
- extensions-reload)
- echo "Reloading $DESC configuration files."
- asterisk_rx 'extensions reload'
- ;;
- restart|force-reload)
- $0 stop
- $0 start
- ;;
- status)
- status
- exit $?
- ;;
- zaptel-fix)
- echo "Unloading and reloading loading Asterisk and Zaptel:"
- $0 stop
- /etc/init.d/zaptel unload
- # load modules from /etc/modules. This will break if you count on
- # discover/hotplug
- /etc/init.d/module-init-tools
- /etc/init.d/zaptel start
- $0 start
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload|status|debug|logger-reload|extensions-reload|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Deleted: asterisk1.2/trunk/debian/asterisk.logrotate
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk.logrotate 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk.logrotate 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,9 +0,0 @@
-/var/log/asterisk/cdr-custom/Master.csv /var/log/asterisk/debug /var/log/asterisk/event_log /var/log/asterisk/messages {
- weekly
- missingok
- rotate 4
- sharedscripts
- postrotate
- /usr/sbin/invoke-rc.d asterisk logger-reload
- endscript
-}
Deleted: asterisk1.2/trunk/debian/asterisk.postrm
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk.postrm 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk.postrm 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,10 +0,0 @@
-#! /bin/sh -e
-
-if [ "$1" = purge ]; then
- userdel -r asterisk 2>/dev/null || true
- rm -fR /var/log/asterisk
- rm -f /etc/default/asterisk || true
-
-fi
-
-#DEBHELPER#
Added: asterisk1.2/trunk/debian/asterisk1.2-bristuff.install
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-bristuff.install (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-bristuff.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,5 @@
+bristuff/usr/lib/asterisk usr/lib/
+bristuff/usr/sbin usr/
+bristuff/usr/share/man usr/share/
+bristuff/var/lib/asterisk var/lib/
+usr/share/asterisk/firmware/iax/
Added: asterisk1.2/trunk/debian/asterisk1.2-bristuff.links
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-bristuff.links (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-bristuff.links 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+usr/share/man/man8/asterisk.8 usr/share/man/man8/rasterisk.8
Added: asterisk1.2/trunk/debian/asterisk1.2-classic.install
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-classic.install (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-classic.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,4 @@
+usr/lib/asterisk
+usr/sbin
+var/lib/asterisk
+usr/share/asterisk/firmware/iax
Added: asterisk1.2/trunk/debian/asterisk1.2-classic.links
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-classic.links (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-classic.links 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+usr/share/man/man8/asterisk.8 usr/share/man/man8/rasterisk.8
Added: asterisk1.2/trunk/debian/asterisk1.2-config.install
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-config.install (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-config.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+etc/asterisk
Added: asterisk1.2/trunk/debian/asterisk1.2-config.postinst
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-config.postinst (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-config.postinst 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+
+case "$1" in
+ configure)
+ if [ -x /usr/share/asterisk/bin/asterisk_fix ]; then
+ /usr/share/asterisk/bin/asterisk_fix
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: asterisk1.2/trunk/debian/asterisk1.2-dev.install
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-dev.install (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-dev.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+usr/include/asterisk
Added: asterisk1.2/trunk/debian/asterisk1.2-doc.docs
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-doc.docs (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-doc.docs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,10 @@
+BUGS
+asterisk.sgml
+README
+CREDITS
+HARDWARE
+SECURITY
+doc/*
+contrib
+images/*.gif
+images/*.jpg
Added: asterisk1.2/trunk/debian/asterisk1.2-doc.examples
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-doc.examples (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-doc.examples 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,4 @@
+sample.call
+configs/*
+muted.conf.sample
+agi/agi-test.agi
Added: asterisk1.2/trunk/debian/asterisk1.2-gtk-console.install
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-gtk-console.install (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-gtk-console.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+usr/lib/asterisk/modules/pbx_gtkconsole.so
Added: asterisk1.2/trunk/debian/asterisk1.2-h323.install
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-h323.install (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-h323.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+usr/lib/asterisk/modules/chan_h323.so
Added: asterisk1.2/trunk/debian/asterisk1.2-sounds-main.docs
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-sounds-main.docs (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-sounds-main.docs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+sounds.txt
Added: asterisk1.2/trunk/debian/asterisk1.2-sounds-main.install
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-sounds-main.install (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-sounds-main.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,2 @@
+usr/share/asterisk/sounds
+usr/share/asterisk/mohmp3
Added: asterisk1.2/trunk/debian/asterisk1.2-sounds.install
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-sounds.install (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-sounds.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,3 @@
+usr/share/asterisk/sounds
+usr/share/asterisk/mohmp3
+var/spool/asterisk
Added: asterisk1.2/trunk/debian/asterisk1.2-web-vmail.install
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2-web-vmail.install (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2-web-vmail.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+usr/lib/cgi-bin/asterisk/vmail.cgi
Added: asterisk1.2/trunk/debian/asterisk1.2.default
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2.default (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2.default 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,25 @@
+# This file allows you to alter the configuration of the Asterisk
+# init.d script
+#
+# RUNASTERISK: run asterisk upon boot. Should be set to "yes" once you have
+# setup your configuration.
+RUNASTERISK=no
+#
+#
+# AST_REALTIME: if set to anything other than "no", asterisk will run in
+# real-time priority (pass '-p' to asterisk). un-rem the
+# following line to disable asterisk from running in real-time
+# priority
+#AST_REALTIME=yes
+#
+# PARAMS: extra parameters to pass to asterisk
+# The example here may help you in debugging, but is
+# *not**intended**for**production**use*.
+# When you give -G *only* that group will be used,
+# else all groups of the asterisk user.
+#PARAMS="-D -g -vvv"
+#
+#
+# RUNASTSAFE: run safe_asterisk rather than asterisk (will auto-restart upon
+# crash)
+#RUNASTSAFE=yes
Added: asterisk1.2/trunk/debian/asterisk1.2.init
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2.init (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2.init 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,190 @@
+#! /bin/sh
+#
+# asterisk start the asterisk PBX
+# (c) Mark Purcell <msp at debian.org>
+# May be distributed under the terms of this General Public License
+#
+# Based on:
+#
+# skeleton example file to build /etc/init.d/ scripts.
+# This file should be used to construct scripts for /etc/init.d.
+#
+# Written by Miquel van Smoorenburg <miquels at cistron.nl>.
+# Modified for Debian GNU/Linux
+# by Ian Murdock <imurdock at gnu.ai.mit.edu>.
+#
+# Version: @(#)skeleton 1.9 26-Feb-2001 miquels at cistron.nl
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+NAME=asterisk
+USER=$NAME
+GROUP=$USER
+DAEMON=/usr/sbin/$NAME
+DESC="Asterisk PBX"
+PIDFILE="/var/run/asterisk/asterisk.pid"
+ASTSAFE_PIDFILE="/var/run/asterisk/asterisk_safe.pid"
+UMASK=007 # by default
+
+
+# by default: use real-time priority
+PARAMS=""
+AST_REALTIME="yes"
+RUNASTERISK="yes"
+if [ -r /etc/default/$NAME ]; then . /etc/default/$NAME; fi
+
+if [ "$RUNASTERISK" != "yes" ];then
+ echo "Asterisk not yet configured. Edit /etc/default/asterisk first."
+ exit 0
+fi
+
+if [ "$AST_REALTIME" != "no" ]
+then
+ PARAMS="$PARAMS -p"
+fi
+
+if [ "x$USER" = "x" ]
+then
+ echo "Error: empty USER name"
+ exit 1
+fi
+if [ `id -u "$USER"` = 0 ]
+then
+ echo "Starting as root not supported."
+ exit 1
+fi
+PARAMS="$PARAMS -U $USER"
+
+if [ "x$AST_DEBUG_PARAMS" = x ]
+then
+ AST_DEBUG_PARAMS=-cvvvvvddddd
+fi
+if [ "$RUNASTSAFE" = "yes" ];then
+ # The value of WRAPPER_DAEMON in can be set in /etc/default/asterisk
+ WRAPPER_DAEMON=${WRAPPER_DAEMON:-/usr/sbin/safe_asterisk}
+ REALDAEMON="$WRAPPER_DAEMON"
+else
+ REALDAEMON="$DAEMON"
+fi
+
+test -x $DAEMON || exit 0
+
+set -e
+
+if [ "$UMASK" != '' ]
+then
+ umask $UMASK
+fi
+
+status() {
+ plist=`ps auxw | grep "$DAEMON" | grep -v grep | awk '{print $2}' | tr '\012' ' '`
+ if [ "$plist" = "" ]; then
+ echo "$DESC is stopped"
+ return 1
+ else
+ echo "$DESC is running: $plist"
+ return 0
+ fi
+}
+
+asterisk_rx() {
+ if ! status >/dev/null; then return 0; fi
+ $DAEMON -rx "$1"
+}
+
+case "$1" in
+ debug)
+ # we add too many special parameters that I don't want to skip
+ # accidentally. I'm afraid that skipping -U once may cause
+ # confusing results. I also want to maintain the user's choice
+ # of -p
+ echo "Debugging $DESC: "
+ $DAEMON $PARAMS $AST_DEBUG_PARAMS
+ exit 0
+ ;;
+ start)
+ if status > /dev/null; then
+ echo "$DESC is already running. Use restart."
+ exit 0
+ fi
+ echo -n "Starting $DESC: "
+ if [ "$RUNASTSAFE" != "yes" ];then
+ # TODO: what if we cought the wrapper just as its asterisk
+ # was killed? status should check for the wrapper if we're in
+ # "safe mode"
+ if status > /dev/null; then
+ echo "$DESC is already running. Use restart."
+ exit 0
+ fi
+ start-stop-daemon --start --group $GROUP --pidfile "$PIDFILE" \
+ --exec $REALDAEMON -- $PARAMS
+ else
+ start-stop-daemon --start --group $GROUP --make-pidfile \
+ --pidfile "$ASTSAFE_PIDFILE" \
+ --exec $REALDAEMON -- $PARAMS
+ fi
+
+
+ echo "$NAME."
+ ;;
+ stop)
+ echo -n "Stopping $DESC: "
+ if [ "$RUNASTSAFE" = "yes" ];then
+ # hopefully this will work. Untested
+ $REALDAEMON -rx 'stop now' > /dev/null || true
+ else
+ # Try gracefully.
+ # this may hang in some cases. Specifically, when the asterisk
+ # processes is stopped. No bother to worry about cleanup:
+ # it will either fail or die when asterisk dies.
+ ( $DAEMON -rx 'stop now' > /dev/null 2>&1 & ) &
+ fi
+ echo -n "$NAME"
+ ## giving a small grace time to shut down cleanly.
+ #sleep 2 # you can add timeouts in the comma
+ if [ "$RUNASTSAFE" = "yes" ];then
+ start-stop-daemon --quiet --pidfile $ASTSAFE_PIDFILE --oknodo \
+ --stop
+ fi
+ # just making sure it's really, really dead.
+ # KILL is necessary just in case there's an asterisk -r in the background
+ start-stop-daemon --stop --quiet --oknodo --retry=0/2/TERM/2/KILL/5 --exec $DAEMON
+ echo "."
+ ;;
+ reload)
+ echo "Reloading $DESC configuration files."
+ asterisk_rx 'reload'
+ ;;
+ logger-reload)
+ asterisk_rx 'logger reload'
+ ;;
+ extensions-reload)
+ echo "Reloading $DESC configuration files."
+ asterisk_rx 'extensions reload'
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ status)
+ status
+ exit $?
+ ;;
+ zaptel-fix)
+ echo "Unloading and reloading loading Asterisk and Zaptel:"
+ $0 stop
+ /etc/init.d/zaptel unload
+ # load modules from /etc/modules. This will break if you count on
+ # discover/hotplug
+ /etc/init.d/module-init-tools
+ /etc/init.d/zaptel start
+ $0 start
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|reload|status|debug|logger-reload|extensions-reload|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Added: asterisk1.2/trunk/debian/asterisk1.2.logrotate
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2.logrotate (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2.logrotate 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,9 @@
+/var/log/asterisk/cdr-custom/Master.csv /var/log/asterisk/debug /var/log/asterisk/event_log /var/log/asterisk/messages {
+ weekly
+ missingok
+ rotate 4
+ sharedscripts
+ postrotate
+ /usr/sbin/invoke-rc.d asterisk logger-reload
+ endscript
+}
Added: asterisk1.2/trunk/debian/asterisk1.2.postrm
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2.postrm (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2.postrm 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+if [ "$1" = purge ]; then
+ userdel -r asterisk 2>/dev/null || true
+ rm -fR /var/log/asterisk
+ rm -f /etc/default/asterisk || true
+
+fi
+
+#DEBHELPER#
Added: asterisk1.2/trunk/debian/asterisk1.2_fix
===================================================================
--- asterisk1.2/trunk/debian/asterisk1.2_fix (rev 0)
+++ asterisk1.2/trunk/debian/asterisk1.2_fix 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,116 @@
+#! /bin/sh
+
+if getent passwd asterisk >/dev/null ;then
+ # Some halfbaked Sarge versions needed their home dir fixed:
+ if [ "`getent passwd asterisk|awk -F: '{print $6}'`" = \
+ "/var/run/asterisk" ];then
+ usermod -d /var/lib/asterisk asterisk
+ fi
+else
+ adduser_extra_opts=""
+ # Cosmetic noise reduction
+ if [ -d "/var/lib/asterisk" ]; then
+ adduser_extra_opts="--no-create-home"
+ fi
+ adduser --system --group --home /var/lib/asterisk \
+ $adduser_extra_opts \
+ --gecos "Asterisk PBX daemon" asterisk
+fi
+
+for group in dialout audio; do
+ if groups asterisk | grep -w -q -v $group; then
+ adduser asterisk $group
+ fi
+done
+
+# Update from /usr/share/asterisk/sounds/priv-callerintros to
+# /var/lib/asterisk/sounds/priv-callerintros
+if [ -d /usr/share/asterisk/sounds/priv-callerintros ];then
+ if [ -L /usr/share/asterisk/sounds/priv-callerintros ];then
+ # if this is a fresh install just try to move the symlink.
+ userprovided=0
+ if [ ! -L /var/lib/asterisk/sounds/priv-callerintros ];then
+ if [ `find /var/lib/asterisk/sounds/priv-callerintros -mindepth 1|wc -l` -gt 0 ];then
+ rmdir /var/lib/asterisk/sounds/priv-callerintros
+ echo -n "Updating private callerintros location to /var/lib/asterisk/sounds/priv-callerintros"
+ ln -s `readlink /usr/share/asterisk/sounds/priv-callerintros` /var/lib/asterisk/sounds/priv-callerintros
+ rm /usr/share/asterisk/sounds/priv-callerintros
+ echo '.'
+ else
+ userprovided=1
+ fi
+ else
+ userprovided=1
+ fi
+ if [ "$userprovided" = "1" ];then
+ echo 'Found user installed private callerintros. Not updating private callerintros'
+ echo 'directory to new directory. Please adjust symlink manually to new location'
+ echo '/var/lib/asterisk/sounds/priv-callerintros.'
+ fi
+ else
+ echo -n "Updating private callerintros location to /var/lib/asterisk/sounds/priv-callerintros"
+ find /usr/share/asterisk/sounds/priv-callerintros -mindepth 1 -maxdepth 1 -exec mv '{}' /var/lib/asterisk/sounds/priv-callerintros \;
+ rmdir /usr/share/asterisk/sounds/priv-callerintros
+ echo "."
+ fi
+fi
+
+# Make sure all (possibly) used dirs exist and is owned by asterisk
+
+# /var/run/asterisk is not yet handled by init.d :-(
+# (/var/run/asterisk is handled in sysV script /etc/init.d/asterisk)
+
+dirs="
+ /var/log/asterisk
+ /var/spool/asterisk
+ /var/lib/asterisk
+ /var/run/asterisk
+ /etc/asterisk
+"
+
+subdirs="
+ /var/lib/asterisk/sounds/priv-callerintros
+ /var/log/asterisk/cdr-csv
+ /var/log/asterisk/cdr-custom
+ /var/spool/asterisk/dictate
+ /var/spool/asterisk/meetme
+ /var/spool/asterisk/monitor
+ /var/spool/asterisk/monitor
+ /var/spool/asterisk/system
+ /var/spool/asterisk/tmp
+ /var/spool/asterisk/voicemail
+"
+
+for dir in $subdirs $dirs; do
+ mkdir -p "$dir"
+done
+
+for dir in $dirs; do
+ chown -R asterisk: "$dir"
+done
+
+
+###################################
+# this part should be reviewed, but it's basically trial and error
+# code i wrote to make freepbx work. better solutions are welcomed.
+
+# files need to be RW by the group
+# dirs need to a+rx
+chmod -R 0660 /etc/asterisk/
+find /etc/asterisk/ -type d | xargs chmod ug+rx
+
+#chmod g+s /etc/asterisk/
+
+# this is needed because othewise sqlite cannot write to the DB
+#chmod -R 0660 /var/lib/asterisk/
+
+####################################
+# If asterisk in running, reload it
+# otherwise start it
+if [ -x "/etc/init.d/asterisk" ];then
+ if [ -f /var/run/asterisk/asterisk.pid ];then
+ invoke-rc.d asterisk reload || exit $?
+ else
+ invoke-rc.d asterisk restart || exit $?
+ fi
+fi
Property changes on: asterisk1.2/trunk/debian/asterisk1.2_fix
___________________________________________________________________
Name: svn:executable
+ *
Deleted: asterisk1.2/trunk/debian/asterisk_fix
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/asterisk_fix 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/asterisk_fix 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,116 +0,0 @@
-#! /bin/sh
-
-if getent passwd asterisk >/dev/null ;then
- # Some halfbaked Sarge versions needed their home dir fixed:
- if [ "`getent passwd asterisk|awk -F: '{print $6}'`" = \
- "/var/run/asterisk" ];then
- usermod -d /var/lib/asterisk asterisk
- fi
-else
- adduser_extra_opts=""
- # Cosmetic noise reduction
- if [ -d "/var/lib/asterisk" ]; then
- adduser_extra_opts="--no-create-home"
- fi
- adduser --system --group --home /var/lib/asterisk \
- $adduser_extra_opts \
- --gecos "Asterisk PBX daemon" asterisk
-fi
-
-for group in dialout audio; do
- if groups asterisk | grep -w -q -v $group; then
- adduser asterisk $group
- fi
-done
-
-# Update from /usr/share/asterisk/sounds/priv-callerintros to
-# /var/lib/asterisk/sounds/priv-callerintros
-if [ -d /usr/share/asterisk/sounds/priv-callerintros ];then
- if [ -L /usr/share/asterisk/sounds/priv-callerintros ];then
- # if this is a fresh install just try to move the symlink.
- userprovided=0
- if [ ! -L /var/lib/asterisk/sounds/priv-callerintros ];then
- if [ `find /var/lib/asterisk/sounds/priv-callerintros -mindepth 1|wc -l` -gt 0 ];then
- rmdir /var/lib/asterisk/sounds/priv-callerintros
- echo -n "Updating private callerintros location to /var/lib/asterisk/sounds/priv-callerintros"
- ln -s `readlink /usr/share/asterisk/sounds/priv-callerintros` /var/lib/asterisk/sounds/priv-callerintros
- rm /usr/share/asterisk/sounds/priv-callerintros
- echo '.'
- else
- userprovided=1
- fi
- else
- userprovided=1
- fi
- if [ "$userprovided" = "1" ];then
- echo 'Found user installed private callerintros. Not updating private callerintros'
- echo 'directory to new directory. Please adjust symlink manually to new location'
- echo '/var/lib/asterisk/sounds/priv-callerintros.'
- fi
- else
- echo -n "Updating private callerintros location to /var/lib/asterisk/sounds/priv-callerintros"
- find /usr/share/asterisk/sounds/priv-callerintros -mindepth 1 -maxdepth 1 -exec mv '{}' /var/lib/asterisk/sounds/priv-callerintros \;
- rmdir /usr/share/asterisk/sounds/priv-callerintros
- echo "."
- fi
-fi
-
-# Make sure all (possibly) used dirs exist and is owned by asterisk
-
-# /var/run/asterisk is not yet handled by init.d :-(
-# (/var/run/asterisk is handled in sysV script /etc/init.d/asterisk)
-
-dirs="
- /var/log/asterisk
- /var/spool/asterisk
- /var/lib/asterisk
- /var/run/asterisk
- /etc/asterisk
-"
-
-subdirs="
- /var/lib/asterisk/sounds/priv-callerintros
- /var/log/asterisk/cdr-csv
- /var/log/asterisk/cdr-custom
- /var/spool/asterisk/dictate
- /var/spool/asterisk/meetme
- /var/spool/asterisk/monitor
- /var/spool/asterisk/monitor
- /var/spool/asterisk/system
- /var/spool/asterisk/tmp
- /var/spool/asterisk/voicemail
-"
-
-for dir in $subdirs $dirs; do
- mkdir -p "$dir"
-done
-
-for dir in $dirs; do
- chown -R asterisk: "$dir"
-done
-
-
-###################################
-# this part should be reviewed, but it's basically trial and error
-# code i wrote to make freepbx work. better solutions are welcomed.
-
-# files need to be RW by the group
-# dirs need to a+rx
-chmod -R 0660 /etc/asterisk/
-find /etc/asterisk/ -type d | xargs chmod ug+rx
-
-#chmod g+s /etc/asterisk/
-
-# this is needed because othewise sqlite cannot write to the DB
-#chmod -R 0660 /var/lib/asterisk/
-
-####################################
-# If asterisk in running, reload it
-# otherwise start it
-if [ -x "/etc/init.d/asterisk" ];then
- if [ -f /var/run/asterisk/asterisk.pid ];then
- invoke-rc.d asterisk reload || exit $?
- else
- invoke-rc.d asterisk restart || exit $?
- fi
-fi
Modified: asterisk1.2/trunk/debian/changelog
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/changelog 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/changelog 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,3 +1,10 @@
+asterisk1.2 (1:1.2.18~dfsg-1) UNRELEASED; urgency=low
+
+ * NOT YET RELEASED
+ * Moved asterisk 1.2 series into own namespace
+
+ -- Kilian Krause <kilian at debian.org> Wed, 30 May 2007 19:18:00 +0200
+
asterisk (1:1.2.16~dfsg-1) unstable; urgency=high
Modified: asterisk1.2/trunk/debian/control
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/control 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/control 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,19 +1,20 @@
-Source: asterisk
+Source: asterisk1.2
Priority: optional
Section: comm
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.2.3-1), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.2.3-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.13-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev (>= 1.1.12-3), graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), dpkg (>= 1.13.19), libogg-dev, libvorbis-dev
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone1.2-dev (>= 1:1.2.3-1), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri1.2-dev (>= 1.2.3-1), dpatch (>= 2.0.10), zaptel1.2-source (>= 1:1.2.13-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev (>= 1.1.12-3), graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), dpkg (>= 1.13.19), libogg-dev, libvorbis-dev
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
-Package: asterisk
+Package: asterisk1.2
Architecture: all
Section: comm
-Depends: asterisk-classic (>= ${source:Version}) | asterisk-bristuff (>= ${source:Version}), adduser (>= 3.63)
-Conflicts: asterisk-oh323 (<= 0.6.6pre3-3)
-Suggests: gnomemeeting, ekiga, ohphone, kphone, asterisk-doc, asterisk-dev, asterisk-rate-engine
+Depends: asterisk1.2-classic (>= ${source:Version}) | asterisk1.2-bristuff (>= ${source:Version}), adduser (>= 3.63)
+Conflicts: asterisk-oh323 (<= 0.6.6pre3-3), asterisk
+Replaces: asterisk
+Suggests: ekiga, ohphone, kphone, asterisk1.2-doc, asterisk1.2-dev, asterisk-rate-engine
Description: Open Source Private Branch Exchange (PBX)
Asterisk is an Open Source PBX and telephony toolkit. It is, in a
sense, middleware between Internet and telephony channels on the bottom,
@@ -37,11 +38,12 @@
.
Website: http://www.asterisk.org.
-Package: asterisk-classic
+Package: asterisk1.2-classic
Architecture: any
Section: comm
-Depends: ${shlibs:Depends}, asterisk (= ${source:Version}), asterisk-config (= ${source:Version}) | asterisk-config-custom, adduser (>= 3.63), asterisk-sounds-main (>= 1:1.0.2)
-Conflicts: asterisk-bristuff
+Depends: ${shlibs:Depends}, asterisk1.2 (= ${source:Version}), asterisk1.2-config (= ${source:Version}) | asterisk1.2-config-custom, adduser (>= 3.63), asterisk1.2-sounds-main (>= 1:1.0.2)
+Conflicts: asterisk1.2-bristuff, asterisk-classic
+Replaces: asterisk-classic
Description: Open Source Private Branch Exchange (PBX) - original Digium version
Asterisk is an Open Source PBX and telephony toolkit. It is, in a
sense, middleware between Internet and telephony channels on the bottom,
@@ -65,11 +67,12 @@
.
Website: http://www.asterisk.org.
-Package: asterisk-bristuff
+Package: asterisk1.2-bristuff
Architecture: any
Section: comm
-Depends: ${shlibs:Depends}, asterisk (= ${source:Version}), asterisk-config (= ${source:Version}) | asterisk-config-custom, adduser (>= 3.63), asterisk-sounds-main (>= 1:1.0.2)
-Conflicts: asterisk-classic
+Depends: ${shlibs:Depends}, asterisk1.2 (= ${source:Version}), asterisk1.2-config (= ${source:Version}) | asterisk1.2-config-custom, adduser (>= 3.63), asterisk1.2-sounds-main (>= 1:1.0.2)
+Conflicts: asterisk1.2-classic, asterisk-bristuff
+Replaces: asterisk-bristuff
Description: Open Source Private Branch Exchange (PBX) - BRIstuff-enabled version
Asterisk is an Open Source PBX and telephony toolkit. It is, in a
sense, middleware between Internet and telephony channels on the bottom,
@@ -96,10 +99,11 @@
.
Website: http://www.asterisk.org.
-Package: asterisk-h323
+Package: asterisk1.2-h323
Architecture: any
-Recommends: asterisk, asterisk-oh323
-Replaces: asterisk (<= 1:1.0.2-2)
+Recommends: asterisk1.2, asterisk-oh323
+Conflicts: asterisk-h323
+Replaces: asterisk-h323
Section: comm
Depends: ${shlibs:Depends}
Description: asterisk H.323 VoIP channel
@@ -108,10 +112,10 @@
It was separated out into its own package to avoid having the main package
depend on the many openh323 dependencies.
-Package: asterisk-doc
-Recommends: asterisk
-Conflicts: asterisk (<=0.1.12-3)
-Replaces: asterisk (<=0.1.12-3)
+Package: asterisk1.2-doc
+Recommends: asterisk1.2
+Conflicts: asterisk (<= 0.1.12-3), asterisk-doc
+Replaces: asterisk-doc
Section: doc
Architecture: all
Description: documentation for asterisk
@@ -120,11 +124,11 @@
This package contains the source documentation needed if you wish to
extend the asterisk package.
-Package: asterisk-dev
+Package: asterisk1.2-dev
Architecture: all
-Recommends: asterisk
-Conflicts: asterisk (<=0.1.12-3)
-Replaces: asterisk (<=0.1.12-3)
+Recommends: asterisk1.2
+Conflicts: asterisk-dev
+Replaces: asterisk-dev
Section: devel
Description: development files for asterisk
Asterisk is an Open Source PBX and telephony toolkit.
@@ -132,19 +136,21 @@
This package contains the include files used if you wish to compile a
package which requires asterisk source file headers.
-Package: asterisk-sounds-main
+Package: asterisk1.2-sounds-main
Architecture: all
-Recommends: asterisk
-Conflicts: asterisk (<=0.1.12-3), asterisk-sounds (<= 1:1.0.2-1)
-Replaces: asterisk (<=0.4.0-5), asterisk-sounds (<= 1:1.0.2-1), asterisk-sounds-extra
+Recommends: asterisk1.2
+Conflicts: asterisk (<=0.1.12-3), asterisk-sounds (<= 1:1.0.2-1), asterisk-sounds-main
+Replaces: asterisk (<=0.4.0-5), asterisk-sounds (<= 1:1.0.2-1), asterisk-sounds-extra, asterisk-sounds-main
Section: comm
Description: sound files for asterisk
Asterisk is an Open Source PBX and telephony toolkit.
.
This package contains the default sound files for operation of asterisk
-Package: asterisk-web-vmail
-Recommends: asterisk
+Package: asterisk1.2-web-vmail
+Recommends: asterisk1.2
+Conflicts: asterisk-web-vmail
+Replaces: asterisk-web-vmail
Architecture: all
Depends: httpd-cgi, libapache-dbi-perl | libdbi-perl
Section: comm
@@ -153,11 +159,11 @@
.
This package contains a web-based interface for the voice-mail system
-Package: asterisk-config
+Package: asterisk1.2-config
Recommends: asterisk
Depends: adduser (>= 3.63)
-Replaces: asterisk (<= 1:1.0.2-2)
-Conflicts: asterisk-config-custom
+Replaces: asterisk (<= 1:1.0.2-2), asterisk-config
+Conflicts: asterisk-config-custom, asterisk-config
Architecture: all
Section: comm
Description: config files for asterisk
Modified: asterisk1.2/trunk/debian/rules
===================================================================
--- asterisk/tags/1.2.16~dfsg-1/debian/rules 2007-05-30 11:31:49 UTC (rev 3628)
+++ asterisk1.2/trunk/debian/rules 2007-05-31 17:02:53 UTC (rev 3629)
@@ -37,7 +37,7 @@
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
-FILENAME := asterisk_$(UPVERSION)~dfsg.orig.tar.gz
+FILENAME := asterisk1.2_$(UPVERSION)~dfsg.orig.tar.gz
UPFILENAME := asterisk_$(UPVERSION).orig.tar.gz
URL := http://ftp2.digium.com/pub/asterisk/releases/asterisk-$(UPVERSION).tar.gz
@@ -49,7 +49,7 @@
(echo "WARNING: fpm sounds must to be removed from sources before packaging." ; false )
touch $@
-BRISTUFF_DIR=debian/build/asterisk-bristuff
+BRISTUFF_DIR=debian/build/asterisk1.2-bristuff
config.status: check-sounds patch-stamp
dh_testdir
# Add here commands to configure the package.
@@ -72,7 +72,7 @@
cd editline;./configure $(confflags)
touch $@
-debian/build/asterisk-bristuff/config.status: config.status check-sounds patch-stamp
+debian/build/asterisk1.2-bristuff/config.status: config.status check-sounds patch-stamp
# get ourselves a copy of the source to build bristuff in...
rm -rf $(BRISTUFF_DIR)
mkdir -p $(BRISTUFF_DIR)
@@ -85,7 +85,7 @@
touch $@
build-arch: build-arch-stamp
-build-arch-stamp: config.status debian/build/asterisk-bristuff/config.status
+build-arch-stamp: config.status debian/build/asterisk1.2-bristuff/config.status
dh_testdir
# Add here command to compile/build the package.
@@ -102,7 +102,7 @@
# Add here command to compile/build the arch indep package.
# It's ok not to do anything here, if you don't need to build
# anything for this package.
- #/usr/bin/docbook-to-man debian/asterisk.sgml > asterisk.1
+ #/usr/bin/docbook-to-man debian/asterisk1.2.sgml > asterisk.1
ifndef ASTERISK_NO_DOCS
$(MAKE) progdocs
endif
@@ -147,7 +147,7 @@
# Add here commands to install the package into debian/<packagename>
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install samples
- cp channels/h323/h323.conf.sample $(CURDIR)/debian/tmp/etc/asterisk/h323.conf
+ cp channels/h323/h323.conf.sample $(CURDIR)/debian/tmp/etc/asterisk1.2/h323.conf
mkdir -p $(CURDIR)/debian/tmp/usr/lib/cgi-bin/asterisk/
cp contrib/scripts/vmail.cgi $(CURDIR)/debian/tmp/usr/lib/cgi-bin/asterisk/
chmod +x $(CURDIR)/debian/tmp/usr/lib/cgi-bin/asterisk/vmail.cgi
@@ -155,9 +155,9 @@
# in the sample configs:
cp -a debian/ast_config/* $(CURDIR)/debian/tmp/etc/asterisk
- mkdir -p $(CURDIR)/debian/asterisk/usr/share/asterisk/bin
- cp debian/asterisk_fix $(CURDIR)/debian/asterisk/usr/share/asterisk/bin
- chmod +x $(CURDIR)/debian/asterisk/usr/share/asterisk/bin/asterisk_fix
+ mkdir -p $(CURDIR)/debian/asterisk1.2/usr/share/asterisk/bin
+ cp debian/asterisk1.2_fix $(CURDIR)/debian/asterisk1.2/usr/share/asterisk/bin
+ chmod +x $(CURDIR)/debian/asterisk1.2/usr/share/asterisk/bin/asterisk_fix
mkdir -p $(CURDIR)/debian/tmp/usr/share/asterisk/firmware/iax
@@ -165,7 +165,7 @@
$(MAKE) -C $(BRISTUFF_DIR) DESTDIR=$(CURDIR)/debian/tmp/bristuff install
dh_install --sourcedir=debian/tmp
- install -m 644 include/asterisk.h $(CURDIR)/debian/asterisk-dev/usr/include/asterisk.h
+ install -m 644 include/asterisk.h $(CURDIR)/debian/asterisk1.2-dev/usr/include/asterisk.h
# Build architecture-independent files here.
binary-indep: build install
@@ -191,7 +191,7 @@
dh_testdir -a
dh_testroot -a
dh_installdocs -a
- dh_installman -pasterisk-classic -pasterisk-bristuff *.[1-8] debian/*.1 debian/*.8
+ dh_installman -pasterisk1.2-classic -pasterisk1.2-bristuff *.[1-8] debian/*.1 debian/*.8
dh_installexamples -a -XCVS
dh_installchangelogs ChangeLog -a
dh_strip -a
@@ -199,10 +199,10 @@
dh_compress -a
dh_fixperms -a
dh_installdeb -a
- #rm debian/asterisk/usr/lib/asterisk/modules/pbx_gtkconsole.so
- rm -f debian/asterisk-classic/usr/lib/asterisk/modules/chan_h323.so
- rm -f debian/asterisk-bristuff/usr/lib/asterisk/modules/chan_h323.so
- rm -f debian/asterisk-bristuff/usr/lib/asterisk/modules/*_capi*.so
+ #rm debian/asterisk1.2/usr/lib/asterisk/modules/pbx_gtkconsole.so
+ rm -f debian/asterisk1.2-classic/usr/lib/asterisk/modules/chan_h323.so
+ rm -f debian/asterisk1.2-bristuff/usr/lib/asterisk/modules/chan_h323.so
+ rm -f debian/asterisk1.2-bristuff/usr/lib/asterisk/modules/*_capi*.so
dh_makeshlibs -a
dh_shlibdeps -a
dh_gencontrol -a
@@ -219,16 +219,16 @@
@@echo Downloading $(UPFILENAME) from $(URL) ...
@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
@@echo Repacking as DFSG-free...
- @@mkdir -p ../tarballs/asterisk-$(UPVERSION).tmp/
- @@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
+ @@mkdir -p ../tarballs/asterisk1.2-$(UPVERSION).tmp/
+ @@cd ../tarballs/asterisk1.2-$(UPVERSION).tmp ; \
tar xfz ../$(UPFILENAME)
- @@find ../tarballs/asterisk-$(UPVERSION).tmp -type f -name 'fpm-*.mp3'|xargs -r rm
- @@rm -rf ../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)/codecs/ilbc
- @@rm -rf ../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)/contrib/firmware/
- @@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
+ @@find ../tarballs/asterisk1.2-$(UPVERSION).tmp -type f -name 'fpm-*.mp3'|xargs -r rm
+ @@rm -rf ../tarballs/asterisk1.2-$(UPVERSION).tmp/asterisk1.2-$(UPVERSION)/codecs/ilbc
+ @@rm -rf ../tarballs/asterisk1.2-$(UPVERSION).tmp/asterisk1.2-$(UPVERSION)/contrib/firmware/
+ @@cd ../tarballs/asterisk1.2-$(UPVERSION).tmp ; \
tar cfz ../$(FILENAME) *
@@echo Cleaning up...
- @@$(RM) -rf ../tarballs/asterisk-$(UPVERSION).tmp/
+ @@$(RM) -rf ../tarballs/asterisk1.2-$(UPVERSION).tmp/
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install clean patch unpatch
Added: libpri1.2/build-area
===================================================================
--- libpri1.2/build-area (rev 0)
+++ libpri1.2/build-area 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../build-area
\ No newline at end of file
Property changes on: libpri1.2/build-area
___________________________________________________________________
Name: svn:special
+ *
Added: libpri1.2/tags/build-area
===================================================================
--- libpri1.2/tags/build-area (rev 0)
+++ libpri1.2/tags/build-area 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../../build-area
\ No newline at end of file
Property changes on: libpri1.2/tags/build-area
___________________________________________________________________
Name: svn:special
+ *
Added: libpri1.2/tags/tarballs
===================================================================
--- libpri1.2/tags/tarballs (rev 0)
+++ libpri1.2/tags/tarballs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../../tarballs/
\ No newline at end of file
Property changes on: libpri1.2/tags/tarballs
___________________________________________________________________
Name: svn:special
+ *
Added: libpri1.2/tarballs
===================================================================
--- libpri1.2/tarballs (rev 0)
+++ libpri1.2/tarballs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../tarballs/
\ No newline at end of file
Property changes on: libpri1.2/tarballs
___________________________________________________________________
Name: svn:special
+ *
Copied: libpri1.2/trunk (from rev 3628, libpri/tags/1.2.4-1)
Modified: libpri1.2/trunk/debian/changelog
===================================================================
--- libpri/tags/1.2.4-1/debian/changelog 2007-05-30 11:31:49 UTC (rev 3628)
+++ libpri1.2/trunk/debian/changelog 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,3 +1,9 @@
+libpri1.2 (1.2.4-2) UNRELEASED; urgency=low
+
+ * NOT YET RELEASED
+
+ -- Kilian Krause <kilian at debian.org> Wed, 30 May 2007 19:41:47 +0200
+
libpri (1.2.4-1) unstable; urgency=low
* New upstream release.
Modified: libpri1.2/trunk/debian/control
===================================================================
--- libpri/tags/1.2.4-1/debian/control 2007-05-30 11:31:49 UTC (rev 3628)
+++ libpri1.2/trunk/debian/control 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,4 +1,4 @@
-Source: libpri
+Source: libpri1.2
Priority: optional
Section: libs
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>> 4.0.0), dpatch
Standards-Version: 3.6.1
-Package: libpri-dev
+Package: libpri1.2-dev
Section: libdevel
Architecture: any
Depends: libpri1.2 (= ${Source-Version})
@@ -19,7 +19,7 @@
Architecture: any
Depends: ${shlibs:Depends} ${misc:Depends}
Replaces: libpri1
-Conflicts: libpri1
+Conflicts: libpri1, libpri1.2 (>= 1.4)
Description: Primary Rate ISDN specification library
C implementation of the Primary Rate ISDN specification. It was
based on the Bellcore specification SR-NWT-002343 for National ISDN. As of
Deleted: libpri1.2/trunk/debian/libpri-dev.dirs
===================================================================
--- libpri/tags/1.2.4-1/debian/libpri-dev.dirs 2007-05-30 11:31:49 UTC (rev 3628)
+++ libpri1.2/trunk/debian/libpri-dev.dirs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
Deleted: libpri1.2/trunk/debian/libpri-dev.files
===================================================================
--- libpri/tags/1.2.4-1/debian/libpri-dev.files 2007-05-30 11:31:49 UTC (rev 3628)
+++ libpri1.2/trunk/debian/libpri-dev.files 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,5 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
-/usr/lib/*.la
Added: libpri1.2/trunk/debian/libpri1.2-dev.dirs
===================================================================
--- libpri1.2/trunk/debian/libpri1.2-dev.dirs (rev 0)
+++ libpri1.2/trunk/debian/libpri1.2-dev.dirs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
Added: libpri1.2/trunk/debian/libpri1.2-dev.files
===================================================================
--- libpri1.2/trunk/debian/libpri1.2-dev.files (rev 0)
+++ libpri1.2/trunk/debian/libpri1.2-dev.files 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,5 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+/usr/lib/*.la
Modified: libpri1.2/trunk/debian/rules
===================================================================
--- libpri/tags/1.2.4-1/debian/rules 2007-05-30 11:31:49 UTC (rev 3628)
+++ libpri1.2/trunk/debian/rules 2007-05-31 17:02:53 UTC (rev 3629)
@@ -25,7 +25,7 @@
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/~dfsg$$//')
-FILENAME := libpri_$(UPVERSION).orig.tar.gz
+FILENAME := libpri1.2_$(UPVERSION).orig.tar.gz
URL := http://ftp2.digium.com/pub/libpri/releases/libpri-$(UPVERSION).tar.gz
# shared library versions, option 1
Added: zaptel1.2/build-area
===================================================================
--- zaptel1.2/build-area (rev 0)
+++ zaptel1.2/build-area 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../build-area
\ No newline at end of file
Property changes on: zaptel1.2/build-area
___________________________________________________________________
Name: svn:special
+ *
Added: zaptel1.2/tags/build-area
===================================================================
--- zaptel1.2/tags/build-area (rev 0)
+++ zaptel1.2/tags/build-area 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../../build-area
\ No newline at end of file
Property changes on: zaptel1.2/tags/build-area
___________________________________________________________________
Name: svn:special
+ *
Added: zaptel1.2/tags/tarballs
===================================================================
--- zaptel1.2/tags/tarballs (rev 0)
+++ zaptel1.2/tags/tarballs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../../tarballs/
\ No newline at end of file
Property changes on: zaptel1.2/tags/tarballs
___________________________________________________________________
Name: svn:special
+ *
Added: zaptel1.2/tarballs
===================================================================
--- zaptel1.2/tarballs (rev 0)
+++ zaptel1.2/tarballs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+link ../tarballs/
\ No newline at end of file
Property changes on: zaptel1.2/tarballs
___________________________________________________________________
Name: svn:special
+ *
Copied: zaptel1.2/trunk (from rev 3628, zaptel/tags/1.2.16~dfsg-1)
Modified: zaptel1.2/trunk/debian/changelog
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/changelog 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/changelog 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,3 +1,9 @@
+zaptel1.2 (1:1.2.16~dfsg-2) UNRELEASED; urgency=low
+
+ * NOT YET RELEASED
+
+ -- Kilian Krause <kilian at debian.org> Wed, 30 May 2007 19:46:56 +0200
+
zaptel (1:1.2.16~dfsg-1) unstable; urgency=low
[ Mark Purcell ]
Modified: zaptel1.2/trunk/debian/control
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/control 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/control 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,4 +1,4 @@
-Source: zaptel
+Source: zaptel1.2
Section: comm
Priority: optional
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
@@ -8,12 +8,13 @@
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/
-Package: zaptel
+Package: zaptel1.2
Section: comm
Architecture: any
# Xorcom packages depend on xpp-firmware. Debian zaptel will probably
# just recommend it.
Depends: ${shlibs:Depends}, procps, fxload
+Conflicts: zaptel
Description: zapata telephony utilities
Userspace utilities for configuring the Zapata telephony kernel driver,
which supports various telephony hardware, such as Wildcard series of
@@ -21,27 +22,30 @@
.
Includes ztcfg and zttool utils.
-Package: libtonezone1
+Package: libtonezone1.2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
+Conflicts: libtonezone1
Description: tonezone library (runtime)
A library for generating tones used for telephone signalling.
-Package: libtonezone-dev
+Package: libtonezone1.2-dev
Section: libdevel
Architecture: any
-Depends: libtonezone1 (= ${Source-Version})
+Depends: libtonezone1.2 (= ${Source-Version})
+Conflicts: libtonezone-dev
Description: tonezone library (development)
A library for generating tones used for telephone signalling.
.
This package contains the development files.
-Package: zaptel-source
+Package: zaptel1.2-source
Section: devel
Architecture: all
Depends: debhelper (>> 4.0), module-assistant (>= 0.8.1), bzip2
-Recommends: zaptel
+Recommends: zaptel1.2
+Conflicts: zaptel-source
Suggests: rtai-source
Description: Zapata telephony interface (source code for kernel driver)
This package contains the source code for zaptel kernel module providing
Modified: zaptel1.2/trunk/debian/control.modules.in
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/control.modules.in 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/control.modules.in 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,14 +1,15 @@
-Source: zaptel
+Source: zaptel1.2
Section: comm
Priority: extra
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Kilian Krause <kk at verfaction.de>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Santiago Ruano Rincon <santiago at unicauca.edu.co>
+Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Santiago Ruano Rincon <santiago at unicauca.edu.co>
Build-Depends: debhelper (>> 3.0.0), bzip2
Standards-Version: 3.6.1.1
-Package: zaptel-modules-_KVERS_
+Package: zaptel1.2-modules-_KVERS_
Architecture: any
-Provides: zaptel-modules
+Provides: zaptel1.2-modules
+Conflicts: zaptel-modules-_KVERS_
Description: zaptel modules for Linux (kernel _KVERS_).
This package contains the set of loadable kernel modules for the
zapata telephony API.
Deleted: zaptel1.2/trunk/debian/libtonezone-dev.install
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/libtonezone-dev.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/libtonezone-dev.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,3 +0,0 @@
-usr/include/*.h
-usr/lib/lib*.a
-usr/lib/lib*.so
Deleted: zaptel1.2/trunk/debian/libtonezone-dev.links
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/libtonezone-dev.links 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/libtonezone-dev.links 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,2 +0,0 @@
-usr/lib/libtonezone.so.1.0 usr/lib/libtonezone.so
-
Added: zaptel1.2/trunk/debian/libtonezone1.2-dev.install
===================================================================
--- zaptel1.2/trunk/debian/libtonezone1.2-dev.install (rev 0)
+++ zaptel1.2/trunk/debian/libtonezone1.2-dev.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,3 @@
+usr/include/*.h
+usr/lib/lib*.a
+usr/lib/lib*.so
Added: zaptel1.2/trunk/debian/libtonezone1.2-dev.links
===================================================================
--- zaptel1.2/trunk/debian/libtonezone1.2-dev.links (rev 0)
+++ zaptel1.2/trunk/debian/libtonezone1.2-dev.links 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,2 @@
+usr/lib/libtonezone.so.1.0 usr/lib/libtonezone.so
+
Added: zaptel1.2/trunk/debian/libtonezone1.2.docs
===================================================================
--- zaptel1.2/trunk/debian/libtonezone1.2.docs (rev 0)
+++ zaptel1.2/trunk/debian/libtonezone1.2.docs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+tonezones.txt
Added: zaptel1.2/trunk/debian/libtonezone1.2.install
===================================================================
--- zaptel1.2/trunk/debian/libtonezone1.2.install (rev 0)
+++ zaptel1.2/trunk/debian/libtonezone1.2.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
Added: zaptel1.2/trunk/debian/libtonezone1.2.links
===================================================================
--- zaptel1.2/trunk/debian/libtonezone1.2.links (rev 0)
+++ zaptel1.2/trunk/debian/libtonezone1.2.links 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,2 @@
+usr/lib/libtonezone.so.1.0 usr/lib/libtonezone.so.1
+
Deleted: zaptel1.2/trunk/debian/libtonezone1.docs
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/libtonezone1.docs 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/libtonezone1.docs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-tonezones.txt
Deleted: zaptel1.2/trunk/debian/libtonezone1.install
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/libtonezone1.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/libtonezone1.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
Deleted: zaptel1.2/trunk/debian/libtonezone1.links
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/libtonezone1.links 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/libtonezone1.links 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,2 +0,0 @@
-usr/lib/libtonezone.so.1.0 usr/lib/libtonezone.so.1
-
Deleted: zaptel1.2/trunk/debian/zaptel-modules.modules
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel-modules.modules 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel-modules.modules 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,11 +0,0 @@
-options torisa base=0xd0000
-alias char-major-196 torisa
-post-install wcfxs /sbin/ztcfg
-post-install wcfxsusb /sbin/ztcfg
-post-install torisa /sbin/ztcfg
-post-install tor2 /sbin/ztcfg
-post-install wcfxo /sbin/ztcfg
-post-install wct1xxp /sbin/ztcfg
-post-install qozap /sbin/ztcfg
-post-install zaphfc /sbin/ztcfg
-post-install zaphfc-florz /sbin/ztcfg
Deleted: zaptel1.2/trunk/debian/zaptel-source.dirs
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel-source.dirs 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel-source.dirs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,2 +0,0 @@
-usr/src
-usr/include/linux
Deleted: zaptel1.2/trunk/debian/zaptel.dirs
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel.dirs 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel.dirs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,3 +0,0 @@
-etc/modprobe.d
-etc/udev/rules.d
-usr/share/lintian/overrides
Deleted: zaptel1.2/trunk/debian/zaptel.init
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel.init 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel.init 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,178 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides: zaptel
-# Required-Start:
-# Required-Stop:
-# Should-Start: $local_fs hotplug module-init-tools
-# Should-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Configures zaptel kernel modules.
-# Description: Configures zaptel kernel modules. Waits until
-# they are fully loaded or loads ztdummy (if modules
-# are availble).
-### END INIT INFO
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/sbin/ztcfg
-ZAPCONF_FILE=/etc/zaptel.conf
-NAME=zaptel
-DESC="Zaptel telephony kernel driver"
-FXOTUNE=/usr/sbin/fxotune
-
-# Include am defaults if available
-if [ -f /etc/default/zaptel ] ; then
- . /etc/default/zaptel
-fi
-
-if [ ! -x $DAEMON ] ; then
- echo >&2 $NAME ":" $DAEMON "fails test for exists and executable" ;
- exit 0
-fi
-
-if [ ! -f $ZAPCONF_FILE ] ; then
- echo >&2 $NAME ":" $ZAPCONF_FILE "fails test for exists and readable";
- exit 0
-fi
-
-# defined in /etc/default/zaptel
-# ZAPTEL_MODS is a list of modules to be loaded at startup
-
-set -e
-
-zap_reg_xpp() {
- if [ ! -d /proc/xpp ]; then return; fi
-
- # Get a list of connected Astribank devices, sorted by the name of
- # the USB connector. That order is rather arbitrary, but will not
- # change without changes to the cabling.
- xbusses=`sort -k 2 /proc/xpp/xbuses | awk -F: '/STATUS=connected/ {print $1}'`
-
- # get a list of XPDs that were not yet registered as zaptel spans.
- # this will be the case if you set the parameter zap_autoreg=0 to
- # the module xpp
- # Append /dev/null to provide a valid file name in case of an empty pattern.
- xbusses_pattern=`echo $xbusses| sed -e 's|XBUS-[0-9]*|/proc/xpp/&/XPD-*/zt_registration|g'`' /dev/null'
- xpds_to_register=`grep -l 0 $xbusses_pattern 2>/dev/null` || true
- for file in $xpds_to_register; do
- echo 1 >$file
- done
-}
-
-fix_asterisbank_sync() {
- # do nothing if module not present
- if [ ! -d /proc/xpp ]; then return; fi
-
- #if ! grep -q '^HOST' /proc/xpp/sync 2>/dev/null; then return; fi
-
- case "$XPP_SYNC" in
- n*|N*) return;;
- host|HOST) sync_value="HOST";;
- [0-9]*)sync_value="$XPP_SYNC";;
- *)
- # find the number of the first bus, and sync from it:
- fxo_pat=`awk -F: '/STATUS=connected/{print $1}' /proc/xpp/xbuses | sed -e 's|.*|/proc/xpp/&/*/fxo_info|'`
- # find the first FXO unit, and set it as the sync master
- bus=`ls -1 $fxo_pat 2> /dev/null | head -n1 | cut -d- -f2 | cut -d/ -f1`
-
- # do nothing if there is no bus:
- case "$bus" in [0-9]*):;; *) return;; esac
- sync_value="$bus 0"
- ;;
- esac
- # the built-in echo of bash fails to print a proper error on failure
- if ! /bin/echo "$sync_value" >/proc/xpp/sync
- then
- echo >&2 "Updating XPP sync source failed (used XPP_SYNC='$XPP_SYNC')"
- fi
-}
-
-# recursively unload a module and its dependencies, if possible.
-# where's modprobe -r when you need it?
-# inputs: module to unload.
-unload_module() {
- set +e
- module="$1"
- line=`lsmod 2>/dev/null | grep "^$module "`
- if [ "$line" = '' ]; then return; fi # module was not loaded
-
- set -- $line
- # $1: the original module, $2: size, $3: refcount, $4: deps list
- mods=`echo $4 | tr , ' '`
- # xpd_fxs actually sort of depends on xpp:
- case "$module" in xpd_*) mods="xpp_usb $mods";; esac
- for mod in $mods; do
- # run in a subshell, so it won't step over our vars:
- (unload_module $mod)
- done
- rmmod $module || true
- set -e
-}
-
-# sleep a while until the xpp modules fully register
-wait_for_xpp() {
- if [ -d /proc/xpp ] && \
- [ "`cat /sys/module/xpp/parameters/zap_autoreg`" = 'Y' ]
- then
- # wait for the XPDs to register:
- # TODO: improve error reporting and produce a messagee here
- cat /proc/xpp/XBUS-*/waitfor_xpds 2>/dev/null >/dev/null || true
- fi
-}
-
-# this checks that:
-# A. /dev/zap/pseudo exists (if devfs/udev is in use, it implies zaptel loaded)
-# B. Readable to the user running this script. No poblem if run by root.
-# C. There is an active zaptel timing source. Either a zaptel hardware
-# device or ztdummy.
-test_zaptel_timing() {
- head -c 0 /dev/zap/pseudo 2>/dev/null
-}
-
-case "$1" in
- start|reload)
- echo -n "$DESC: "
- #for module in $ZAPTEL_MODS
- #do
- # modprobe $module
- #done
- wait_for_xpp
- zap_reg_xpp
- fix_asterisbank_sync
-
- # If there is no zaptel timing source, load
- # ztdummy. Other modules should have been loaded by
- # now.
- if ! test_zaptel_timing
- then modprobe ztdummy || true # will fail if there is no module package
- fi
- if [ -r /etc/fxotune.conf ] && [ -x $FXOTUNE ]; then
- $FXOTUNE -s
- fi
-
- # configure existing modules:
- $DAEMON $DAEMON_OPTS || echo -n $DAEMON "failed. Check" $ZAPCONF_FILE
- echo "$NAME."
- ;;
- stop)
- : # do nothing
- ;;
- unload)
- unload_module zaptel
- ;;
- status)
- check_zaptel_timing
- ;;
- force-reload|restart)
- # there's no 'stop'
- $0 start
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|force-reload|status|unload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Deleted: zaptel1.2/trunk/debian/zaptel.install
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel.install 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,7 +0,0 @@
-sbin/*
-usr/sbin/*
-usr/share/perl5/Zaptel*
-usr/share/zaptel/*
-usr/share/man/man8/*
-etc/hotplug/usb/*
-etc/udev/rules.d/*
Deleted: zaptel1.2/trunk/debian/zaptel.lintian
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel.lintian 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel.lintian 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,5 +0,0 @@
-zaptel: mknod-in-maintainer-script postinst:31
-zaptel: mknod-in-maintainer-script postinst:32
-zaptel: mknod-in-maintainer-script postinst:33
-zaptel: mknod-in-maintainer-script postinst:34
-zaptel: mknod-in-maintainer-script postinst:38
Deleted: zaptel1.2/trunk/debian/zaptel.modprobe.d
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel.modprobe.d 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel.modprobe.d 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,14 +0,0 @@
-options torisa base=0xd0000
-alias char-major-196 torisa
-install tor2 /sbin/modprobe --ignore-install tor2 && /sbin/ztcfg
-install torisa /sbin/modprobe --ignore-install torisa && /sbin/ztcfg
-install wcusb /sbin/modprobe --ignore-install wcusb && /sbin/ztcfg
-install wcfxo /sbin/modprobe --ignore-install wcfxo && /sbin/ztcfg
-install wcfxs /sbin/modprobe --ignore-install wcfxs && /sbin/ztcfg
-install ztdynamic /sbin/modprobe --ignore-install ztdynamic && /sbin/ztcfg
-install ztd-eth /sbin/modprobe --ignore-install ztd-eth && /sbin/ztcfg
-install wct1xxp /sbin/modprobe --ignore-install wct1xxp && /sbin/ztcfg
-install wct4xxp /sbin/modprobe --ignore-install wct4xxp && /sbin/ztcfg
-install wcte11xp /sbin/modprobe --ignore-install wcte11xp && /sbin/ztcfg
-install zaphfc /sbin/modprobe --ignore-install zaphfc && /sbin/ztcfg
-install qozap /sbin/modprobe --ignore-install qozap && /sbin/ztcfg
Deleted: zaptel1.2/trunk/debian/zaptel.modules
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel.modules 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel.modules 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,20 +0,0 @@
-# Uncomment the appropriate alias line, and change 'torisa' to the
-# driver for your card
-
-# DevFS
-#alias /dev/zap torisa
-
-# Non-DevFS
-#alias char-major-196 torisa
-
-options torisa base=0xd0000
-
-post-install wcfxs ztcfg
-post-install wcfxsusb ztcfg
-post-install torisa ztcfg
-post-install tor2 ztcfg
-post-install wcfxo ztcfg
-post-install wct1xxp ztcfg
-post-install zaphfc ztcfg
-post-install zaphfc-florz ztcfg
-post-install qozap ztcfg
Deleted: zaptel1.2/trunk/debian/zaptel.postinst
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel.postinst 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel.postinst 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,67 +0,0 @@
-#! /bin/sh
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-
-DYNFS=`ps ax | grep -v grep`
-
-case "$1" in
- configure)
-
- #MAKEDEV zaptel
-
- if ! echo $DYNFS | grep -q devfsd || echo $DYNFS | grep -q udevd ; then
- mkdir -p /dev/zap
- rm -f /dev/zap/ctl
- rm -f /dev/zap/channel
- rm -f /dev/zap/pseudo
- rm -f /dev/zap/timer
- rm -f /dev/zap/253
- rm -f /dev/zap/252
- rm -f /dev/zap/251
- rm -f /dev/zap/250
- mknod /dev/zap/ctl c 196 0
- mknod /dev/zap/timer c 196 253
- mknod /dev/zap/channel c 196 254
- mknod /dev/zap/pseudo c 196 255
- N=1;
- for N in `seq 250`; do
- rm -f /dev/zap/$N;
- mknod /dev/zap/$N c 196 $N;
- N=`expr $N + 1`
- done
- chown 0:dialout /dev/zap/ -R
- chmod 0660 /dev/zap/*
- else
- echo "**** Dynamic filesystem detected -- not creating device nodes"
- echo "**** If you are running udev, read README.Debian"
- fi
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
Deleted: zaptel1.2/trunk/debian/zaptel.postrm
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel.postrm 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel.postrm 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,42 +0,0 @@
-#! /bin/sh
-# postrm script for zaptel
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postrm> `remove'
-# * <postrm> `purge'
-# * <old-postrm> `upgrade' <new-version>
-# * <new-postrm> `failed-upgrade' <old-version>
-# * <new-postrm> `abort-install'
-# * <new-postrm> `abort-install' <old-version>
-# * <new-postrm> `abort-upgrade' <old-version>
-# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-# if test -d /dev/zap/ ; then
-# rm -rf /dev/zap
-# fi
-
-
- ;;
-
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
-
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
Deleted: zaptel1.2/trunk/debian/zaptel.udev.rules
===================================================================
--- zaptel/tags/1.2.16~dfsg-1/debian/zaptel.udev.rules 2007-05-30 11:31:49 UTC (rev 3628)
+++ zaptel1.2/trunk/debian/zaptel.udev.rules 2007-05-31 17:02:53 UTC (rev 3629)
@@ -1,8 +0,0 @@
-# udev rules to load firmware into the Xorcom Astribank:
-
-BUS!="usb", ACTION!="add", GOTO="zaptel_usb_add_end"
-
-SYSFS{idVendor}=="e4e4", SYSFS{idProduct}=="11[345][01]", \
- RUN+="/etc/hotplug/usb/xpp_fxloader udev $sysfs{idVendor}/$sysfs{idProduct}/$sysfs{bcdDevice}"
-
-LABEL="zaptel_usb_add_end"
Added: zaptel1.2/trunk/debian/zaptel1.2-modules.modules
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2-modules.modules (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2-modules.modules 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,11 @@
+options torisa base=0xd0000
+alias char-major-196 torisa
+post-install wcfxs /sbin/ztcfg
+post-install wcfxsusb /sbin/ztcfg
+post-install torisa /sbin/ztcfg
+post-install tor2 /sbin/ztcfg
+post-install wcfxo /sbin/ztcfg
+post-install wct1xxp /sbin/ztcfg
+post-install qozap /sbin/ztcfg
+post-install zaphfc /sbin/ztcfg
+post-install zaphfc-florz /sbin/ztcfg
Added: zaptel1.2/trunk/debian/zaptel1.2-source.dirs
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2-source.dirs (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2-source.dirs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,2 @@
+usr/src
+usr/include/linux
Added: zaptel1.2/trunk/debian/zaptel1.2.dirs
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.dirs (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.dirs 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,3 @@
+etc/modprobe.d
+etc/udev/rules.d
+usr/share/lintian/overrides
Added: zaptel1.2/trunk/debian/zaptel1.2.init
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.init (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.init 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,178 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides: zaptel
+# Required-Start:
+# Required-Stop:
+# Should-Start: $local_fs hotplug module-init-tools
+# Should-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Configures zaptel kernel modules.
+# Description: Configures zaptel kernel modules. Waits until
+# they are fully loaded or loads ztdummy (if modules
+# are availble).
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/sbin/ztcfg
+ZAPCONF_FILE=/etc/zaptel.conf
+NAME=zaptel
+DESC="Zaptel telephony kernel driver"
+FXOTUNE=/usr/sbin/fxotune
+
+# Include am defaults if available
+if [ -f /etc/default/zaptel ] ; then
+ . /etc/default/zaptel
+fi
+
+if [ ! -x $DAEMON ] ; then
+ echo >&2 $NAME ":" $DAEMON "fails test for exists and executable" ;
+ exit 0
+fi
+
+if [ ! -f $ZAPCONF_FILE ] ; then
+ echo >&2 $NAME ":" $ZAPCONF_FILE "fails test for exists and readable";
+ exit 0
+fi
+
+# defined in /etc/default/zaptel
+# ZAPTEL_MODS is a list of modules to be loaded at startup
+
+set -e
+
+zap_reg_xpp() {
+ if [ ! -d /proc/xpp ]; then return; fi
+
+ # Get a list of connected Astribank devices, sorted by the name of
+ # the USB connector. That order is rather arbitrary, but will not
+ # change without changes to the cabling.
+ xbusses=`sort -k 2 /proc/xpp/xbuses | awk -F: '/STATUS=connected/ {print $1}'`
+
+ # get a list of XPDs that were not yet registered as zaptel spans.
+ # this will be the case if you set the parameter zap_autoreg=0 to
+ # the module xpp
+ # Append /dev/null to provide a valid file name in case of an empty pattern.
+ xbusses_pattern=`echo $xbusses| sed -e 's|XBUS-[0-9]*|/proc/xpp/&/XPD-*/zt_registration|g'`' /dev/null'
+ xpds_to_register=`grep -l 0 $xbusses_pattern 2>/dev/null` || true
+ for file in $xpds_to_register; do
+ echo 1 >$file
+ done
+}
+
+fix_asterisbank_sync() {
+ # do nothing if module not present
+ if [ ! -d /proc/xpp ]; then return; fi
+
+ #if ! grep -q '^HOST' /proc/xpp/sync 2>/dev/null; then return; fi
+
+ case "$XPP_SYNC" in
+ n*|N*) return;;
+ host|HOST) sync_value="HOST";;
+ [0-9]*)sync_value="$XPP_SYNC";;
+ *)
+ # find the number of the first bus, and sync from it:
+ fxo_pat=`awk -F: '/STATUS=connected/{print $1}' /proc/xpp/xbuses | sed -e 's|.*|/proc/xpp/&/*/fxo_info|'`
+ # find the first FXO unit, and set it as the sync master
+ bus=`ls -1 $fxo_pat 2> /dev/null | head -n1 | cut -d- -f2 | cut -d/ -f1`
+
+ # do nothing if there is no bus:
+ case "$bus" in [0-9]*):;; *) return;; esac
+ sync_value="$bus 0"
+ ;;
+ esac
+ # the built-in echo of bash fails to print a proper error on failure
+ if ! /bin/echo "$sync_value" >/proc/xpp/sync
+ then
+ echo >&2 "Updating XPP sync source failed (used XPP_SYNC='$XPP_SYNC')"
+ fi
+}
+
+# recursively unload a module and its dependencies, if possible.
+# where's modprobe -r when you need it?
+# inputs: module to unload.
+unload_module() {
+ set +e
+ module="$1"
+ line=`lsmod 2>/dev/null | grep "^$module "`
+ if [ "$line" = '' ]; then return; fi # module was not loaded
+
+ set -- $line
+ # $1: the original module, $2: size, $3: refcount, $4: deps list
+ mods=`echo $4 | tr , ' '`
+ # xpd_fxs actually sort of depends on xpp:
+ case "$module" in xpd_*) mods="xpp_usb $mods";; esac
+ for mod in $mods; do
+ # run in a subshell, so it won't step over our vars:
+ (unload_module $mod)
+ done
+ rmmod $module || true
+ set -e
+}
+
+# sleep a while until the xpp modules fully register
+wait_for_xpp() {
+ if [ -d /proc/xpp ] && \
+ [ "`cat /sys/module/xpp/parameters/zap_autoreg`" = 'Y' ]
+ then
+ # wait for the XPDs to register:
+ # TODO: improve error reporting and produce a messagee here
+ cat /proc/xpp/XBUS-*/waitfor_xpds 2>/dev/null >/dev/null || true
+ fi
+}
+
+# this checks that:
+# A. /dev/zap/pseudo exists (if devfs/udev is in use, it implies zaptel loaded)
+# B. Readable to the user running this script. No poblem if run by root.
+# C. There is an active zaptel timing source. Either a zaptel hardware
+# device or ztdummy.
+test_zaptel_timing() {
+ head -c 0 /dev/zap/pseudo 2>/dev/null
+}
+
+case "$1" in
+ start|reload)
+ echo -n "$DESC: "
+ #for module in $ZAPTEL_MODS
+ #do
+ # modprobe $module
+ #done
+ wait_for_xpp
+ zap_reg_xpp
+ fix_asterisbank_sync
+
+ # If there is no zaptel timing source, load
+ # ztdummy. Other modules should have been loaded by
+ # now.
+ if ! test_zaptel_timing
+ then modprobe ztdummy || true # will fail if there is no module package
+ fi
+ if [ -r /etc/fxotune.conf ] && [ -x $FXOTUNE ]; then
+ $FXOTUNE -s
+ fi
+
+ # configure existing modules:
+ $DAEMON $DAEMON_OPTS || echo -n $DAEMON "failed. Check" $ZAPCONF_FILE
+ echo "$NAME."
+ ;;
+ stop)
+ : # do nothing
+ ;;
+ unload)
+ unload_module zaptel
+ ;;
+ status)
+ check_zaptel_timing
+ ;;
+ force-reload|restart)
+ # there's no 'stop'
+ $0 start
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|force-reload|status|unload}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
Added: zaptel1.2/trunk/debian/zaptel1.2.install
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.install (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.install 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,7 @@
+sbin/*
+usr/sbin/*
+usr/share/perl5/Zaptel*
+usr/share/zaptel/*
+usr/share/man/man8/*
+etc/hotplug/usb/*
+etc/udev/rules.d/*
Added: zaptel1.2/trunk/debian/zaptel1.2.lintian
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.lintian (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.lintian 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,5 @@
+zaptel: mknod-in-maintainer-script postinst:31
+zaptel: mknod-in-maintainer-script postinst:32
+zaptel: mknod-in-maintainer-script postinst:33
+zaptel: mknod-in-maintainer-script postinst:34
+zaptel: mknod-in-maintainer-script postinst:38
Added: zaptel1.2/trunk/debian/zaptel1.2.modprobe.d
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.modprobe.d (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.modprobe.d 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,14 @@
+options torisa base=0xd0000
+alias char-major-196 torisa
+install tor2 /sbin/modprobe --ignore-install tor2 && /sbin/ztcfg
+install torisa /sbin/modprobe --ignore-install torisa && /sbin/ztcfg
+install wcusb /sbin/modprobe --ignore-install wcusb && /sbin/ztcfg
+install wcfxo /sbin/modprobe --ignore-install wcfxo && /sbin/ztcfg
+install wcfxs /sbin/modprobe --ignore-install wcfxs && /sbin/ztcfg
+install ztdynamic /sbin/modprobe --ignore-install ztdynamic && /sbin/ztcfg
+install ztd-eth /sbin/modprobe --ignore-install ztd-eth && /sbin/ztcfg
+install wct1xxp /sbin/modprobe --ignore-install wct1xxp && /sbin/ztcfg
+install wct4xxp /sbin/modprobe --ignore-install wct4xxp && /sbin/ztcfg
+install wcte11xp /sbin/modprobe --ignore-install wcte11xp && /sbin/ztcfg
+install zaphfc /sbin/modprobe --ignore-install zaphfc && /sbin/ztcfg
+install qozap /sbin/modprobe --ignore-install qozap && /sbin/ztcfg
Added: zaptel1.2/trunk/debian/zaptel1.2.modules
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.modules (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.modules 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,20 @@
+# Uncomment the appropriate alias line, and change 'torisa' to the
+# driver for your card
+
+# DevFS
+#alias /dev/zap torisa
+
+# Non-DevFS
+#alias char-major-196 torisa
+
+options torisa base=0xd0000
+
+post-install wcfxs ztcfg
+post-install wcfxsusb ztcfg
+post-install torisa ztcfg
+post-install tor2 ztcfg
+post-install wcfxo ztcfg
+post-install wct1xxp ztcfg
+post-install zaphfc ztcfg
+post-install zaphfc-florz ztcfg
+post-install qozap ztcfg
Added: zaptel1.2/trunk/debian/zaptel1.2.postinst
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.postinst (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.postinst 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,67 @@
+#! /bin/sh
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+
+DYNFS=`ps ax | grep -v grep`
+
+case "$1" in
+ configure)
+
+ #MAKEDEV zaptel
+
+ if ! echo $DYNFS | grep -q devfsd || echo $DYNFS | grep -q udevd ; then
+ mkdir -p /dev/zap
+ rm -f /dev/zap/ctl
+ rm -f /dev/zap/channel
+ rm -f /dev/zap/pseudo
+ rm -f /dev/zap/timer
+ rm -f /dev/zap/253
+ rm -f /dev/zap/252
+ rm -f /dev/zap/251
+ rm -f /dev/zap/250
+ mknod /dev/zap/ctl c 196 0
+ mknod /dev/zap/timer c 196 253
+ mknod /dev/zap/channel c 196 254
+ mknod /dev/zap/pseudo c 196 255
+ N=1;
+ for N in `seq 250`; do
+ rm -f /dev/zap/$N;
+ mknod /dev/zap/$N c 196 $N;
+ N=`expr $N + 1`
+ done
+ chown 0:dialout /dev/zap/ -R
+ chmod 0660 /dev/zap/*
+ else
+ echo "**** Dynamic filesystem detected -- not creating device nodes"
+ echo "**** If you are running udev, read README.Debian"
+ fi
+
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Added: zaptel1.2/trunk/debian/zaptel1.2.postrm
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.postrm (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.postrm 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,42 @@
+#! /bin/sh
+# postrm script for zaptel
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+
+# if test -d /dev/zap/ ; then
+# rm -rf /dev/zap
+# fi
+
+
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Added: zaptel1.2/trunk/debian/zaptel1.2.udev.rules
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.udev.rules (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.udev.rules 2007-05-31 17:02:53 UTC (rev 3629)
@@ -0,0 +1,8 @@
+# udev rules to load firmware into the Xorcom Astribank:
+
+BUS!="usb", ACTION!="add", GOTO="zaptel_usb_add_end"
+
+SYSFS{idVendor}=="e4e4", SYSFS{idProduct}=="11[345][01]", \
+ RUN+="/etc/hotplug/usb/xpp_fxloader udev $sysfs{idVendor}/$sysfs{idProduct}/$sysfs{bcdDevice}"
+
+LABEL="zaptel_usb_add_end"
More information about the Pkg-voip-commits
mailing list