[Pkg-voip-commits] r6989 - in /callweaver/trunk/debian: TODO.Debian backports/etch backports/sarge callweaver.dirs callweaver.install callweaver.postinst control rules watch

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Sun Apr 12 09:28:48 UTC 2009 

Author: tzafrir-guest
Date: Sun Apr 12 09:28:48 2009
New Revision: 6989

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6989
Log:
A callweaver package that builds:

* Disabled building chan_zap for now (fails with dahdi)
* First shot at removing openssl dependency
* First shot at an Etch backport
* Remove a broken watch file, as upstream has no tarball for now

Added:
    callweaver/trunk/debian/TODO.Debian
Removed:
    callweaver/trunk/debian/backports/sarge
    callweaver/trunk/debian/watch
Modified:
    callweaver/trunk/debian/backports/etch
    callweaver/trunk/debian/callweaver.dirs
    callweaver/trunk/debian/callweaver.install
    callweaver/trunk/debian/callweaver.postinst
    callweaver/trunk/debian/control
    callweaver/trunk/debian/rules

Added: callweaver/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/callweaver/trunk/debian/TODO.Debian?rev=6989&op=file
==============================================================================
--- callweaver/trunk/debian/TODO.Debian (added)
+++ callweaver/trunk/debian/TODO.Debian Sun Apr 12 09:28:48 2009
@@ -1,0 +1,9 @@
+* Modules are rebuilt on install.
+* Zaptel support is currently disabled as it fails to build with DAHDI.
+  It seems that DAHDI is uspported in trunk but not in 1.2 .
+* The huge command-line is non-optimal.
+* Links with openssl?
+* A general licenses review
+* Other lintian warnings
+* An upstream tarball would also be nice
+* Write a proper watch file when there is one

Modified: callweaver/trunk/debian/backports/etch
URL: http://svn.debian.org/wsvn/pkg-voip/callweaver/trunk/debian/backports/etch?rev=6989&op=diff
==============================================================================
--- callweaver/trunk/debian/backports/etch (original)
+++ callweaver/trunk/debian/backports/etch Sun Apr 12 09:28:48 2009
@@ -1,10 +1,17 @@
-#!/bin/bash
+#!/bin/sh
 #
-# Hook for automatic backports at Buildserver.NET
+# Hook for automatic backports
 #
 # Target dist: Debian Etch
 
 # Replace libcurl4-openssl-dev with libcurl3-dev
-sed -i -e 's#^\(Build-Depends:.*\)libcurl4[^\ ]*-dev\([ ,$]\+.*\)$#\1libcurl3-dev\2#' debian/control
+sed -i -e 's/^ libcurl4-dev,/ libcurl3-dev,/' debian/control
 
-# replace libcap2-dev with libcap-dev?
+# The optional libloudmouth (for Jabber) is new:
+sed -i -e '/^ libloudmouth/d' debian/control
+
+# on the Etch version, speexdsp is provided by speex:
+sed -i -e '/^ libspeexdsp/d' debian/control
+
+# replace libcap2-dev with libcap-dev:
+sed -i -e 's/^ libcap2-dev,/ libcap-dev,/' debian/control

Modified: callweaver/trunk/debian/callweaver.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/callweaver/trunk/debian/callweaver.dirs?rev=6989&op=diff
==============================================================================
--- callweaver/trunk/debian/callweaver.dirs (original)
+++ callweaver/trunk/debian/callweaver.dirs Sun Apr 12 09:28:48 2009
@@ -1,4 +1,3 @@
-usr/bin
 usr/sbin
 usr/share/callweaver/ogi
 var/lib/callweaver

Modified: callweaver/trunk/debian/callweaver.install
URL: http://svn.debian.org/wsvn/pkg-voip/callweaver/trunk/debian/callweaver.install?rev=6989&op=diff
==============================================================================
--- callweaver/trunk/debian/callweaver.install (original)
+++ callweaver/trunk/debian/callweaver.install Sun Apr 12 09:28:48 2009
@@ -3,6 +3,5 @@
 usr/lib/callweaver/libcwsqlite3*.so.*
 usr/lib/callweaver/modules/*.so
 usr/lib/callweaver/modules/icd/*.so
-usr/sbin
-usr/bin
-etc/callweaver
+usr/sbin/*
+etc/callweaver/*

Modified: callweaver/trunk/debian/callweaver.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/callweaver/trunk/debian/callweaver.postinst?rev=6989&op=diff
==============================================================================
--- callweaver/trunk/debian/callweaver.postinst (original)
+++ callweaver/trunk/debian/callweaver.postinst Sun Apr 12 09:28:48 2009
@@ -27,7 +27,7 @@
 
 	test -d /var/log/callweaver || mkdir /var/log/callweaver
 	test -d /var/log/callweaver/cdr-csv || mkdir /var/log/callweaver/cdr-csv
-	chown -R callweaver.callweaver /var/log/callweaver /var/run/callweaver \
+	chown -R callweaver: /var/log/callweaver /var/run/callweaver \
 		/var/spool/callweaver /var/lib/callweaver /etc/callweaver
 	chmod o-rwx /etc/callweaver/*
 

Modified: callweaver/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/callweaver/trunk/debian/control?rev=6989&op=diff
==============================================================================
--- callweaver/trunk/debian/control (original)
+++ callweaver/trunk/debian/control Sun Apr 12 09:28:48 2009
@@ -1,27 +1,30 @@
 Source: callweaver
 Priority: optional
 Section: comm
+# both have /usr/sbin/smsq:
+Conflicts: asterisk
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Build-Depends: debhelper (>= 4.1.0), 
  dpatch,
  libcap2-dev,
  libspandsp-dev (>= 0.0.6~pre7),
- libssl-dev,
  libncurses-dev,
  libpq-dev,
  libspeex-dev,
+ libspeexdsp-dev,
  libcurl4-dev,
  unixodbc-dev,
  libcapi20-dev,
- zaptel-source,
+ dahdi-source | zaptel-source,
+ libloudmouth1-dev,
  libreadline-dev,
  libsqlite3-dev,
  libmysqlclient15-dev,
  autoconf,
  automake,
  libbluetooth2-dev
-Standards-Version: 3.6.2
+Standards-Version: 3.8.0
 Homepage: http://www.callweaver.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/callweaver/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/callweaver/?op=log

Modified: callweaver/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/callweaver/trunk/debian/rules?rev=6989&op=diff
==============================================================================
--- callweaver/trunk/debian/rules (original)
+++ callweaver/trunk/debian/rules Sun Apr 12 09:28:48 2009
@@ -107,6 +107,8 @@
 				--enable-mysql=yes \
 				--with-app_sql_mysql=yes \
 				--with-cdr_mysql=yes \
+				--enable-zaptel=no \
+				--without-ssl \
 				--with-res_config_mysql=yes 
 
 build: build-stamp

More information about the Pkg-voip-commits mailing list