[Pkg-voip-commits] r1205 - asterisk/trunk/debian
Kilian Krause
kilian at costa.debian.org
Sat Jan 28 19:36:52 UTC 2006
Author: kilian
Date: 2006-01-28 19:36:51 +0000 (Sat, 28 Jan 2006)
New Revision: 1205
Added:
asterisk/trunk/debian/asterisk-bristuff.default
asterisk/trunk/debian/asterisk-bristuff.init
asterisk/trunk/debian/asterisk-bristuff.install
asterisk/trunk/debian/asterisk-bristuff.links
asterisk/trunk/debian/asterisk-bristuff.logrotate
asterisk/trunk/debian/asterisk-classic.default
asterisk/trunk/debian/asterisk-classic.init
asterisk/trunk/debian/asterisk-classic.install
asterisk/trunk/debian/asterisk-classic.links
asterisk/trunk/debian/asterisk-classic.logrotate
Removed:
asterisk/trunk/debian/asterisk.default
asterisk/trunk/debian/asterisk.init
asterisk/trunk/debian/asterisk.install
asterisk/trunk/debian/asterisk.links
asterisk/trunk/debian/asterisk.logrotate
Modified:
asterisk/trunk/debian/control
asterisk/trunk/debian/rules
Log:
prepare asterisk-bristuff binary with asterisk dummy package
Copied: asterisk/trunk/debian/asterisk-bristuff.default (from rev 1197, asterisk/trunk/debian/asterisk.default)
Copied: asterisk/trunk/debian/asterisk-bristuff.init (from rev 1197, asterisk/trunk/debian/asterisk.init)
Copied: asterisk/trunk/debian/asterisk-bristuff.install (from rev 1197, asterisk/trunk/debian/asterisk.install)
===================================================================
--- asterisk/trunk/debian/asterisk.install 2006-01-24 18:21:13 UTC (rev 1197)
+++ asterisk/trunk/debian/asterisk-bristuff.install 2006-01-28 19:36:51 UTC (rev 1205)
@@ -0,0 +1,4 @@
+bristuff/etc/default
+bristuff/usr/lib/asterisk
+bristuff/usr/sbin
+bristuff/var/lib/asterisk
Copied: asterisk/trunk/debian/asterisk-bristuff.links (from rev 1197, asterisk/trunk/debian/asterisk.links)
Copied: asterisk/trunk/debian/asterisk-bristuff.logrotate (from rev 1197, asterisk/trunk/debian/asterisk.logrotate)
Copied: asterisk/trunk/debian/asterisk-classic.default (from rev 1197, asterisk/trunk/debian/asterisk.default)
Copied: asterisk/trunk/debian/asterisk-classic.init (from rev 1197, asterisk/trunk/debian/asterisk.init)
Copied: asterisk/trunk/debian/asterisk-classic.install (from rev 1197, asterisk/trunk/debian/asterisk.install)
Copied: asterisk/trunk/debian/asterisk-classic.links (from rev 1197, asterisk/trunk/debian/asterisk.links)
Copied: asterisk/trunk/debian/asterisk-classic.logrotate (from rev 1197, asterisk/trunk/debian/asterisk.logrotate)
Deleted: asterisk/trunk/debian/asterisk.default
===================================================================
--- asterisk/trunk/debian/asterisk.default 2006-01-28 04:45:31 UTC (rev 1204)
+++ asterisk/trunk/debian/asterisk.default 2006-01-28 19:36:51 UTC (rev 1205)
@@ -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="-g -vvv"
-#
-#
-# RUNASTSAFE: run safe_asterisk rather than asterisk (will auto-restart upon
-# crash)
-#RUNASTSAFE=yes
Deleted: asterisk/trunk/debian/asterisk.init
===================================================================
--- asterisk/trunk/debian/asterisk.init 2006-01-28 04:45:31 UTC (rev 1204)
+++ asterisk/trunk/debian/asterisk.init 2006-01-28 19:36:51 UTC (rev 1205)
@@ -1,162 +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"
-
-# by default: use real-time priority
-PARAMS=""
-AST_REALTIME="yes"
-RUNASTERISK="no"
-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 1
-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
-
-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
-}
-
-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 1
- 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 1
- fi
- fi
- echo -n "Starting $DESC: "
- start-stop-daemon --start --group $GROUP --pidfile "$PIDFILE" \
- --exec $REALDAEMON -- $PARAMS
- 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 --oknodo --stop --exec $WRAPPER_DAEMON
- 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 $REALDAEMON
- echo "."
- ;;
- reload)
- echo "Reloading $DESC configuration files."
- $DAEMON -rx 'reload'
- ;;
- logger-reload)
- $DAEMON -rx 'logger reload'
- ;;
- extensions-reload)
- echo "Reloading $DESC configuration files."
- $DAEMON -rx 'extensions reload'
- ;;
- restart|force-reload)
- $0 stop
- $0 start
- ;;
- status)
- status
- exit $?
- ;;
- *)
- N=/etc/init.d/$NAME
- # echo "Usage: $N {start|stop|restart|reload|logger-reload|extensions-reload|force-reload}" >&2
- echo "Usage: $N {start|stop|status|debug|restart|force-reload}" >&2
- exit 1
- ;;
-esac
-
-exit 0
Deleted: asterisk/trunk/debian/asterisk.install
===================================================================
--- asterisk/trunk/debian/asterisk.install 2006-01-28 04:45:31 UTC (rev 1204)
+++ asterisk/trunk/debian/asterisk.install 2006-01-28 19:36:51 UTC (rev 1205)
@@ -1,4 +0,0 @@
-etc/default
-usr/lib/asterisk
-usr/sbin
-var/lib/asterisk
Deleted: asterisk/trunk/debian/asterisk.links
===================================================================
--- asterisk/trunk/debian/asterisk.links 2006-01-28 04:45:31 UTC (rev 1204)
+++ asterisk/trunk/debian/asterisk.links 2006-01-28 19:36:51 UTC (rev 1205)
@@ -1 +0,0 @@
-usr/share/man/man8/asterisk.8 usr/share/man/man8/rasterisk.8
Deleted: asterisk/trunk/debian/asterisk.logrotate
===================================================================
--- asterisk/trunk/debian/asterisk.logrotate 2006-01-28 04:45:31 UTC (rev 1204)
+++ asterisk/trunk/debian/asterisk.logrotate 2006-01-28 19:36:51 UTC (rev 1205)
@@ -1,9 +0,0 @@
-/var/log/asterisk/cdr-csv/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
-}
Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control 2006-01-28 04:45:31 UTC (rev 1204)
+++ asterisk/trunk/debian/control 2006-01-28 19:36:51 UTC (rev 1205)
@@ -7,12 +7,12 @@
Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libgtk1.2-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.1-4), bison, libasound2-dev, postgresql-dev, unixodbc-dev, libpri-dev (>= 1.2.1-3), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.1-4), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev
Package: asterisk
-Architecture: any
+Architecture: all
Section: comm
-Depends: ${shlibs:Depends}, asterisk-sounds-main (>= 1:1.0.2), asterisk-config (= ${Source-Version}) | asterisk-config-custom, adduser (>= 3.63)
+Depends: asterisk-classic (= ${Source-Version})|asterisk-bristuff (= ${Source-Version}), asterisk-sounds-main (>= 1:1.0.2), asterisk-config (= ${Source-Version}) | asterisk-config-custom
Conflicts: asterisk-oh323 (<= 0.6.6pre3-3)
Suggests: gnomemeeting, ohphone, kphone, asterisk-doc, asterisk-dev, asterisk-rate-engine, mpg123
-Description: open source Private Branch Exchange (PBX)
+Description: Open Source Private Branch Exchange (PBX) - dummy package
Asterisk is an Open Source PBX and telephony toolkit. It is, in a
sense, middleware between Internet and telephony channels on the bottom,
and Internet and telephony applications at the top.
@@ -35,6 +35,65 @@
.
Website: http://www.asterisk.org.
+Package: asterisk-classic
+Architecture: any
+Section: comm
+Depends: ${shlibs:Depends}, adduser (>= 3.63)
+Conflicts: asterisk-bristuff
+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,
+ and Internet and telephony applications at the top.
+ .
+ Asterisk can be used with Voice over IP (SIP, H.323, IAX) standards, or the
+ Public Switched Telephone Network (PSTN) through Supported Hardware.
+ .
+ Supported hardware:
+ .
+ * All Wildcard (tm) products from Digium (http://www.digium.com)
+ * QuickNet Internet PhoneJack and LineJack (http://www.quicknet.net)
+ * Full Duplex Sound Card supported by Linux
+ * Adtran Atlas 800 Plus
+ * ISDN4Linux compatible ISDN card
+ * Tormenta Dual T1 card (http://www.bsdtelephony.com.mx)
+ * CAPI compatible ISDN cards can be run using the add-on package chan-capi
+ .
+ This Debian package includes the sample configuration, with demonstration
+ extensions, etc
+ .
+ Website: http://www.asterisk.org.
+
+Package: asterisk-bristuff
+Architecture: any
+Section: comm
+Depends: ${shlibs:Depends}, adduser (>= 3.63)
+Conflicts: asterisk-classic
+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,
+ and Internet and telephony applications at the top.
+ .
+ The BRIstuff patch from www.junghanns.net enables support from certain
+ hardware like HFC ISDN cards which are mainly consumer hardware.
+ .
+ Asterisk can be used with Voice over IP (SIP, H.323, IAX) standards, or the
+ Public Switched Telephone Network (PSTN) through Supported Hardware.
+ .
+ Supported hardware:
+ .
+ * All Wildcard (tm) products from Digium (http://www.digium.com)
+ * QuickNet Internet PhoneJack and LineJack (http://www.quicknet.net)
+ * Full Duplex Sound Card supported by Linux
+ * Adtran Atlas 800 Plus
+ * ISDN4Linux compatible ISDN card
+ * Tormenta Dual T1 card (http://www.bsdtelephony.com.mx)
+ * CAPI compatible ISDN cards can be run using the add-on package chan-capi
+ .
+ This Debian package includes the sample configuration, with demonstration
+ extensions, etc
+ .
+ Website: http://www.asterisk.org.
+
Package: asterisk-h323
Architecture: any
Recommends: asterisk, asterisk-oh323
Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules 2006-01-28 04:45:31 UTC (rev 1204)
+++ asterisk/trunk/debian/rules 2006-01-28 19:36:51 UTC (rev 1205)
@@ -138,7 +138,7 @@
dh_testroot
dh_clean -k
dh_installdirs var/run/asterisk
-
+
# 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
@@ -151,7 +151,14 @@
# override some default configurations. Leave the original ones
# in the sample configs:
cp debian/ast_config/* $(CURDIR)/debian/tmp/etc/asterisk
-
+
+ # bristuf
+ $(MAKE) -C $(BRISTUFF_DIR) DESTDIR=$(CURDIR)/debian/tmp/bristuff install
+ mkdir -p $(CURDIR)/debian/tmp/bristuff/etc/default/
+ cp debian/asterisk.default $(CURDIR)/debian/tmp/bristuff/etc/default/asterisk
+ $(RM) -f $(CURDIR)/debian/tmp/bristuff/usr/sbin/{stereorize,streamplayer}
+ cp debian/ast_config/* $(CURDIR)/debian/tmp/bristuff/etc/asterisk
+
dh_install --sourcedir=debian/tmp
install -m 644 include/asterisk.h $(CURDIR)/debian/asterisk-dev/usr/include/asterisk.h
More information about the Pkg-voip-commits
mailing list