[Pkg-voip-commits] r1480 - in iaxmodem/trunk: . debian debian/patches

Julien Blache jblache at costa.debian.org
Tue Mar 21 20:30:35 UTC 2006


Author: jblache
Date: 2006-03-21 20:30:34 +0000 (Tue, 21 Mar 2006)
New Revision: 1480

Added:
   iaxmodem/trunk/debian/
   iaxmodem/trunk/debian/README.Debian
   iaxmodem/trunk/debian/changelog
   iaxmodem/trunk/debian/compat
   iaxmodem/trunk/debian/control
   iaxmodem/trunk/debian/copyright
   iaxmodem/trunk/debian/iaxmodem.dirs
   iaxmodem/trunk/debian/iaxmodem.docs
   iaxmodem/trunk/debian/iaxmodem.examples
   iaxmodem/trunk/debian/iaxmodem.init
   iaxmodem/trunk/debian/iaxmodem.logrotate
   iaxmodem/trunk/debian/patches/
   iaxmodem/trunk/debian/patches/00list
   iaxmodem/trunk/debian/patches/10_replacement_spandsp_mmx_h.dpatch
   iaxmodem/trunk/debian/rules
Log:
Load newtrunk into iaxmodem/trunk.


Added: iaxmodem/trunk/debian/README.Debian
===================================================================
--- iaxmodem/trunk/debian/README.Debian	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/README.Debian	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,9 @@
+iaxmodem for Debian
+-------------------
+
+This version of IAXmodem is statically linked against the modified versions
+of libiax2 and spandsp that ship with IAXmodem.
+
+The shared libraries packaged in Debian can't be used, unfortunately.
+
+ -- Julien BLACHE <jblache at debian.org>, Sun, 12 Mar 2006 21:04:21 +0100

Added: iaxmodem/trunk/debian/changelog
===================================================================
--- iaxmodem/trunk/debian/changelog	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/changelog	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,63 @@
+iaxmodem (0.1.2.dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    + Set Maintainer: to Debian VoIP Team, add myself as uploader.
+  * debian/rules:
+    + Use dpatch.
+    + Detect non-Debian sources.
+  * debian/patches/10_replacement_spandsp_mmx_h.dpatch:
+    + Use a replacement spandsp/mmx.h header.
+
+ -- Julien BLACHE <jblache at debian.org>  Tue, 21 Mar 2006 15:29:58 +0100
+
+iaxmodem (0.1.1-2) unstable; urgency=low
+
+  * Source package cleanup
+    + Remove lib/spandsp/src/msvc
+    + Replace lib/spandsp/src/spandsp/mmx.h with a dummy file,
+      disabling MMX and SSE2.
+  * debian/copyright:
+    + List GPL and LGPL files for libiax2.
+
+ -- Julien BLACHE <jblache at debian.org>  Fri, 17 Mar 2006 15:21:44 +0100
+
+iaxmodem (0.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+    + iaxmodem now waits for Asterisk (integrates previous patch).
+  * build:
+    + build with -std=c99 -D_GNU_SOURCE to fix the lrintf() warning, which
+      is a real problem on 64bit architectures.
+
+ -- Julien BLACHE <jblache at debian.org>  Thu, 16 Mar 2006 13:39:05 +0100
+
+iaxmodem (0.1.0-3) unstable; urgency=low
+
+  * iaxmodem.c:
+    + Do not exit if modem is free and we can't register. This allows us to
+      for Asterisk to come up at startup (and allows for restarts of Asterisk).
+  * debian/rules:
+    + Start before HylaFax and Asterisk, stop after HylaFax but before Asterisk.
+  * debian/README.Debian:
+    + Changing HylaFax initscripts' priorities is no longer needed.
+
+ -- Julien BLACHE <jblache at debian.org>  Tue, 14 Mar 2006 15:13:51 +0100
+
+iaxmodem (0.1.0-2) unstable; urgency=low
+
+  * debian/rules:
+    + The init script must run after asterisk.
+  * debian/README.Debian:
+    + Instructions to make the HylaFax init scripts run after iaxmodem.
+
+ -- Julien BLACHE <jblache at debian.org>  Sun, 12 Mar 2006 21:00:01 +0100
+
+iaxmodem (0.1.0-1) unstable; urgency=low
+
+  * Initial Release (closes: #354560).
+
+  This package has been contributed to Debian by Linbox (http://www.linbox.com).
+
+ -- Julien BLACHE <jblache at debian.org>  Thu,  2 Mar 2006 18:05:16 +0100
+

Added: iaxmodem/trunk/debian/compat
===================================================================
--- iaxmodem/trunk/debian/compat	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/compat	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1 @@
+4

Added: iaxmodem/trunk/debian/control
===================================================================
--- iaxmodem/trunk/debian/control	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/control	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,20 @@
+Source: iaxmodem
+Section: comm
+Priority: optional
+Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
+Uploaders: Julien BLACHE <jblache at debian.org>
+Build-Depends: debhelper (>= 4.0.0), dpatch, libtiff4-dev, autotools-dev
+Build-Conflicts: libiax-dev, libspandsp-dev
+Standards-Version: 3.6.2
+
+Package: iaxmodem
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: software modem with IAX2 connectivity
+ IAXmodem is a software modem written in C that uses an IAX channel (commonly
+ provided by an Asterisk PBX system) instead of a traditional phone line and
+ uses a DSP library instead of DSP hardware chipsets.
+ .
+ IAXmodem was originally conceived to function as a fax modem usable with
+ HylaFAX, and it does that well. However IAXmodem also has been known to
+ function with mgetty+sendfax and efax.

Added: iaxmodem/trunk/debian/copyright
===================================================================
--- iaxmodem/trunk/debian/copyright	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/copyright	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,66 @@
+This package was debianized by Julien BLACHE <jblache at debian.org> for
+Linbox (http://www.linbox.com/en) on Mon, 27 Feb 2006 19:33:17 +0100.
+
+It was downloaded from: http://iaxmodem.sf.net
+
+
+IAXmodem uses modified copies of libiax2 and spandsp.
+
+
+IAXmodem
+--------
+Copyright Holder: Lee Howard <faxguy at howardsilvan.com>
+
+License:
+
+IAXmodem is released under the term of the GNU General Public License,
+version 2 or above. On Debian systems, the complete text of the license can
+be found in the /usr/share/common-licenses/GPL file.
+
+
+libiax2
+-------
+Copyright Holder: Mark Spencer <markster at linux-support.net>
+
+License from the README file:
+
+libiax: An implementation of the Inter-Asterisk eXchange protocol distributed
+under the terms of the GNU Lesser General Public License
+
+The following files are marked as being released under the LGPL:
+  src/frame.h
+  src/iax-client.c
+  src/iax.c
+  src/iax.h
+  src/iax2-parser.c
+  src/iax2-parser.h
+  src/iax2.h
+  src/jitterbuf.c
+  src/jitterbuf.h
+  src/winpoop.h
+
+The following files are marked as being released under the GPL:
+  src/answer.h
+  src/miniphone.c
+  src/options.c
+  src/options.h
+  src/ring10.h
+  src/winiphone.c
+
+The following files are in the public domain:
+  src/md5.c
+  src/md5.h
+
+On Debian systems, the complete text of the licenses can be found in the
+/usr/share/common-licenses/LGPL and /usr/share/common-licenses/GPL files.
+
+
+spandsp
+-------
+Copyright Holder: Steve Underwood <steveu at coppice.org>
+
+License:
+
+spandsp is released under the term of the GNU General Public License,
+version 2 or above. On Debian systems, the complete text of the license can
+be found in the /usr/share/common-licenses/GPL file.

Added: iaxmodem/trunk/debian/iaxmodem.dirs
===================================================================
--- iaxmodem/trunk/debian/iaxmodem.dirs	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/iaxmodem.dirs	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,3 @@
+usr/bin
+etc/iaxmodem
+var/log/iaxmodem

Added: iaxmodem/trunk/debian/iaxmodem.docs
===================================================================
--- iaxmodem/trunk/debian/iaxmodem.docs	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/iaxmodem.docs	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,3 @@
+FAQ
+README
+TODO

Added: iaxmodem/trunk/debian/iaxmodem.examples
===================================================================
--- iaxmodem/trunk/debian/iaxmodem.examples	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/iaxmodem.examples	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,2 @@
+config.ttyIAX
+iaxmodem-cfg.ttyIAX

Added: iaxmodem/trunk/debian/iaxmodem.init
===================================================================
--- iaxmodem/trunk/debian/iaxmodem.init	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/iaxmodem.init	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,51 @@
+#! /bin/sh
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/iaxmodem
+NAME=iaxmodem
+DESC=iaxmodem
+
+test -x $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON
+	echo "$NAME."
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/$NAME.pid \
+		--exec $DAEMON
+	echo "$NAME."
+	;;
+  reload)
+	echo -n "Reloading $DESC: "
+	if [ -e /var/run/$NAME.pid ]; then
+	    kill -HUP $(cat /var/run/$NAME.pid)
+	    echo "$NAME."
+	else
+	    echo "$NAME not running!"
+	    exit 1
+	fi
+	;;
+  restart|force-reload)
+	echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON
+	sleep 1
+	start-stop-daemon --start --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+	echo "$NAME."
+	;;
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

Added: iaxmodem/trunk/debian/iaxmodem.logrotate
===================================================================
--- iaxmodem/trunk/debian/iaxmodem.logrotate	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/iaxmodem.logrotate	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,12 @@
+/var/log/iaxmodem/* {
+        weekly
+        missingok
+        rotate 3
+        compress
+        delaycompress
+        notifempty
+        sharedscripts
+        postrotate
+		killall -HUP iaxmodem
+        endscript
+}

Added: iaxmodem/trunk/debian/patches/00list
===================================================================
--- iaxmodem/trunk/debian/patches/00list	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/patches/00list	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,2 @@
+10_replacement_spandsp_mmx_h
+

Added: iaxmodem/trunk/debian/patches/10_replacement_spandsp_mmx_h.dpatch
===================================================================
--- iaxmodem/trunk/debian/patches/10_replacement_spandsp_mmx_h.dpatch	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/patches/10_replacement_spandsp_mmx_h.dpatch	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_replacement_spandsp_mmx_h.dpatch by  <jblache at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Replacement mmx.h header for spandsp; disables SSE2 and MMX.
+
+ at DPATCH@
+diff -urNad iaxmodem-0.1.1~/lib/spandsp/src/spandsp/mmx.h iaxmodem-0.1.1/lib/spandsp/src/spandsp/mmx.h
+--- iaxmodem-0.1.1~/lib/spandsp/src/spandsp/mmx.h	1970-01-01 01:00:00.000000000 +0100
++++ iaxmodem-0.1.1/lib/spandsp/src/spandsp/mmx.h	2006-03-19 22:48:27.284526866 +0100
+@@ -0,0 +1,14 @@
++/*
++ * Dummy mmx.h file for spandsp for Debian.
++ *
++ * GPL'd, fwiw.
++ */
++
++#ifndef __SPANDSP_MMX_H__
++#define __SPANDSP_MMX_H__
++
++/* disable MMX and SSE2 ... */
++#undef USE_MMX
++#undef USE_SSE2
++
++#endif /* !__SPANDSP_MMX_H__ */


Property changes on: iaxmodem/trunk/debian/patches/10_replacement_spandsp_mmx_h.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: iaxmodem/trunk/debian/rules
===================================================================
--- iaxmodem/trunk/debian/rules	2006-03-21 20:29:50 UTC (rev 1479)
+++ iaxmodem/trunk/debian/rules	2006-03-21 20:30:34 UTC (rev 1480)
@@ -0,0 +1,131 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# Include dpatch rules
+include /usr/share/dpatch/dpatch.make
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+autotools-stamp:
+	-rm -f ./lib/libiax2/config.sub ./lib/libiax2/config.guess
+	ln -s /usr/share/misc/config.sub ./lib/libiax2/config.sub
+	ln -s /usr/share/misc/config.guess ./lib/libiax2/config.guess
+
+	-rm -f ./lib/spandsp/config/config.sub ./lib/spandsp/config/config.guess
+	ln -s /usr/share/misc/config.sub ./lib/spandsp/config/config.sub
+	ln -s /usr/share/misc/config.guess ./lib/spandsp/config/config.guess
+
+	touch autotools-stamp
+
+
+configure-stamp: autotools-stamp
+	dh_testdir
+
+	# Check that problematic files have been removed prior to packaging
+	( grep -q Debian lib/spandsp/src/spandsp/mmx.h && \
+		[ ! -d lib/spandsp/src/msvc ] && [ ! -f lib/spandsp/libspandsp.vcproj ] && \
+		[ ! -d lib/spandsp/autom4te.cache ] && [ ! -d lib/libiax2/autom4te.cache ] ) || \
+		(echo "WARNING: sources are not clean!"; false)
+
+	# Add here commands to configure the package.
+	(cd lib/libiax2 && ./configure $(confflags) --disable-shared)
+	(cd lib/spandsp && ./configure $(confflags) --disable-shared)
+
+	touch configure-stamp
+
+
+build: build-stamp
+
+build-stamp: patch-stamp configure-stamp 
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE) -C ./lib/libiax2
+	$(MAKE) -C ./lib/spandsp
+
+	./build static
+
+	touch build-stamp
+
+clean: real-clean unpatch
+real-clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp autotools-stamp
+
+	# Add here commands to clean up after the build process.
+	-$(MAKE) -C ./lib/libiax2 distclean
+	-rm -f ./lib/libiax2/config.sub ./lib/libiax2/config.guess
+	-$(MAKE) -C ./lib/spandsp distclean
+	rm -rf ./lib/spandsp/autom4te.cache
+	-rm -f ./lib/spandsp/config/config.sub ./lib/spandsp/config/config.guess
+
+	-rm -f iaxmodem iaxmodem.o
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/iaxmodem.
+	cp iaxmodem debian/iaxmodem/usr/bin
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGES
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+	dh_installlogrotate
+	# start before hylafax (20), stop after hylafax (20) and before asterisk (21)
+	dh_installinit -- defaults 19 20
+	dh_installman iaxmodem.1
+#	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch real-clean


Property changes on: iaxmodem/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *




More information about the Pkg-voip-commits mailing list